[MPlayer-cvslog] r24510 - trunk/libmpdemux/ms_hdr.h

[zuxy]

Author: zuxy
Date: Sat Sep 15 09:46:38 2007
New Revision: 24510

Log:
Revert r24446 since it breaks mingw32 build: _WINGDI_H is defined in wingdi.h



Modified:
   trunk/libmpdemux/ms_hdr.h

Modified: trunk/libmpdemux/ms_hdr.h
==============================================================================
--- trunk/libmpdemux/ms_hdr.h	(original)
+++ trunk/libmpdemux/ms_hdr.h	Sat Sep 15 09:46:38 2007
@@ -26,7 +26,7 @@ typedef struct __attribute__((__packed__
 } MPEGLAYER3WAVEFORMAT;
 #endif /* _MPEGLAYER3WAVEFORMAT_ */
 
-#ifndef _BITMAPINFOHEADER_
+#if !defined(_BITMAPINFOHEADER_) && !defined(_WINGDI_H)
 #define _BITMAPINFOHEADER_
 typedef struct __attribute__((__packed__))
 {