Mercurial > mplayer.hg

changeset 24490:2074d81d4142

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert r24446 since it breaks mingw32 build: _WINGDI_H is defined in wingdi.h
author zuxy
date Sat, 15 Sep 2007 07:46:38 +0000
parents 97eba82233f5
children 70814421d469
files libmpdemux/ms_hdr.h
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/ms_hdr.h	Fri Sep 14 21:17:48 2007 +0000
+++ b/libmpdemux/ms_hdr.h	Sat Sep 15 07:46:38 2007 +0000
@@ -26,7 +26,7 @@
 } MPEGLAYER3WAVEFORMAT;
 #endif /* _MPEGLAYER3WAVEFORMAT_ */
 
-#ifndef _BITMAPINFOHEADER_
+#if !defined(_BITMAPINFOHEADER_) && !defined(_WINGDI_H)
 #define _BITMAPINFOHEADER_
 typedef struct __attribute__((__packed__))
 {