Change a couple of names that would conflict after all 32[AW] suffixes
are removed. Structures defined in both mmreg.h and mmsystem.h are
protected with #ifdef:s as in MS' headers.
diff --git a/include/mmsystem.h b/include/mmsystem.h
index 4fcdf85..de3bc25 100644
--- a/include/mmsystem.h
+++ b/include/mmsystem.h
@@ -343,6 +343,8 @@
WORD wBitsPerSample;
} PCMWAVEFORMAT, *LPPCMWAVEFORMAT;
+#ifndef _WAVEFORMATEX_
+#define _WAVEFORMATEX_
/* dito same for Win16 / Win32 */
typedef struct {
WORD wFormatTag; /* format type */
@@ -353,7 +355,8 @@
WORD wBitsPerSample; /* number of bits per sample of mono data */
WORD cbSize; /* the count in bytes of the size of */
/* extra information (after cbSize) */
-} WAVEFORMATEX,*LPWAVEFORMATEX;
+} WAVEFORMATEX, *LPWAVEFORMATEX, *NPWAVEFORMATEX, *PWAVEFORMATEX;
+#endif
UINT16 WINAPI waveOutGetNumDevs16(void);
UINT32 WINAPI waveOutGetNumDevs32(void);
