# HG changeset patch # User zuxy # Date 1189842398 0 # Node ID 2074d81d4142d66920a493e3c96d275a92d15b51 # Parent 97eba82233f5ca1c524692e082f3522fddb5ace5 Revert r24446 since it breaks mingw32 build: _WINGDI_H is defined in wingdi.h diff -r 97eba82233f5 -r 2074d81d4142 libmpdemux/ms_hdr.h --- 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__)) {