[MPlayer-cvslog] r26141 - in trunk: libmpdemux/ms_hdr.h loader/wine/mmreg.h loader/wine/vfw.h

[diego]

Author: diego
Date: Sun Mar  2 20:38:50 2008
New Revision: 26141

Log:
Revert fixing illegal identifiers to fix compilation on MinGW. Unfortunately
these identifiers appear in Windows system headers and are thus outside our
direct control.


Modified:
   trunk/libmpdemux/ms_hdr.h
   trunk/loader/wine/mmreg.h
   trunk/loader/wine/vfw.h

Modified: trunk/libmpdemux/ms_hdr.h
==============================================================================
--- trunk/libmpdemux/ms_hdr.h	(original)
+++ trunk/libmpdemux/ms_hdr.h	Sun Mar  2 20:38:50 2008
@@ -1,9 +1,9 @@
 #ifndef MPLAYER_MS_HDR_H
 #define MPLAYER_MS_HDR_H
 
-#ifndef WAVEFORMATEX_
-#define WAVEFORMATEX_
-typedef struct __attribute__((__packed__)) WAVEFORMATEX {
+#ifndef _WAVEFORMATEX_
+#define _WAVEFORMATEX_
+typedef struct __attribute__((__packed__)) _WAVEFORMATEX {
   unsigned short  wFormatTag;
   unsigned short  nChannels;
   unsigned int    nSamplesPerSec;
@@ -12,10 +12,10 @@ typedef struct __attribute__((__packed__
   unsigned short  wBitsPerSample;
   unsigned short  cbSize;
 } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX;
-#endif /* WAVEFORMATEX_ */
+#endif /* _WAVEFORMATEX_ */
 
-#ifndef MPEGLAYER3WAVEFORMAT_
-#define MPEGLAYER3WAVEFORMAT_
+#ifndef _MPEGLAYER3WAVEFORMAT_
+#define _MPEGLAYER3WAVEFORMAT_
 typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag {
   WAVEFORMATEX wf;
   unsigned short wID;
@@ -24,11 +24,11 @@ typedef struct __attribute__((__packed__
   unsigned short nFramesPerBlock;
   unsigned short nCodecDelay;
 } MPEGLAYER3WAVEFORMAT;
-#endif /* MPEGLAYER3WAVEFORMAT_ */
+#endif /* _MPEGLAYER3WAVEFORMAT_ */
 
 /* windows.h #includes wingdi.h on MinGW. */
-#if !defined(BITMAPINFOHEADER_) && !defined(_WINGDI_H)
-#define BITMAPINFOHEADER_
+#if !defined(_BITMAPINFOHEADER_) && !defined(_WINGDI_H)
+#define _BITMAPINFOHEADER_
 typedef struct __attribute__((__packed__))
 {
     int 	biSize;
@@ -47,7 +47,7 @@ typedef struct {
 	BITMAPINFOHEADER bmiHeader;
 	int	bmiColors[1];
 } BITMAPINFO, *LPBITMAPINFO;
-#endif /* !defined(BITMAPINFOHEADER_) && !defined(_WINGDI_H) */
+#endif
 
 #ifndef le2me_BITMAPINFOHEADER
 #ifdef WORDS_BIGENDIAN

Modified: trunk/loader/wine/mmreg.h
==============================================================================
--- trunk/loader/wine/mmreg.h	(original)
+++ trunk/loader/wine/mmreg.h	Sun Mar  2 20:38:50 2008
@@ -48,8 +48,8 @@ typedef struct __attribute__((__packed__
 } ECHOWAVEFILTER, *PECHOWAVEFILTER, *NPECHOWAVEFILTER, *LPECHOWAVEFILTER;
 #endif  /* WAVEFILTER_ECHO */
     
-#ifndef WAVEFORMATEX_
-#define WAVEFORMATEX_
+#ifndef _WAVEFORMATEX_
+#define _WAVEFORMATEX_
 typedef struct __attribute__((__packed__)) WAVEFORMATEX {
   WORD   wFormatTag;
   WORD   nChannels;
@@ -59,7 +59,7 @@ typedef struct __attribute__((__packed__
   WORD   wBitsPerSample;
   WORD   cbSize;
 } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX;
-#endif /* WAVEFORMATEX_ */
+#endif /* _WAVEFORMATEX_ */
 
 #ifndef GUID_TYPE
 #define GUID_TYPE
@@ -72,8 +72,8 @@ typedef struct
 } GUID;
 #endif
 
-#ifndef WAVEFORMATEXTENSIBLE_
-#define WAVEFORMATEXTENSIBLE_
+#ifndef _WAVEFORMATEXTENSIBLE_
+#define _WAVEFORMATEXTENSIBLE_
 typedef struct {
     WAVEFORMATEX    Format;
     union {
@@ -85,10 +85,10 @@ typedef struct {
                                         /* present in stream  */
     GUID            SubFormat;
 } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE;
-#endif /* WAVEFORMATEXTENSIBLE_ */
+#endif // !_WAVEFORMATEXTENSIBLE_
 
-#ifndef MPEGLAYER3WAVEFORMAT_
-#define MPEGLAYER3WAVEFORMAT_
+#ifndef _MPEGLAYER3WAVEFORMAT_
+#define _MPEGLAYER3WAVEFORMAT_
 typedef struct mpeglayer3waveformat_tag {
   WORD   wFormatTag WINE_PACKED;
   WORD   nChannels WINE_PACKED;
@@ -103,7 +103,7 @@ typedef struct mpeglayer3waveformat_tag 
   WORD          nFramesPerBlock WINE_PACKED;
   WORD          nCodecDelay WINE_PACKED;
 } MPEGLAYER3WAVEFORMAT;
-#endif /* MPEGLAYER3WAVEFORMAT_ */
+#endif /* !_MPEGLAYER3WAVEFORMAT_ */
 
 /* WAVE form wFormatTag IDs */
 

Modified: trunk/loader/wine/vfw.h
==============================================================================
--- trunk/loader/wine/vfw.h	(original)
+++ trunk/loader/wine/vfw.h	Sun Mar  2 20:38:50 2008
@@ -19,8 +19,8 @@ typedef struct __attribute__((__packed__
     long   bfOffBits;
 } BITMAPFILEHEADER;
 
-#ifndef BITMAPINFOHEADER_
-#define BITMAPINFOHEADER_
+#ifndef _BITMAPINFOHEADER_
+#define _BITMAPINFOHEADER_
 typedef struct __attribute__((__packed__))
 {
     long 	biSize;