diff options
| author | zuxy <zuxy@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-09-15 07:46:38 +0000 |
|---|---|---|
| committer | zuxy <zuxy@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-09-15 07:46:38 +0000 |
| commit | a353d4e0556e850d212d70f7dd591a6d03871a0c (patch) | |
| tree | a34cab991ca398872bff0d922a13c09f2029b11d /libmpdemux | |
| parent | eaf7b8614fd02374e811b73967076fc48c6b461d (diff) | |
| download | mpv-a353d4e0556e850d212d70f7dd591a6d03871a0c.tar.bz2 mpv-a353d4e0556e850d212d70f7dd591a6d03871a0c.tar.xz | |
Revert r24446 since it breaks mingw32 build: _WINGDI_H is defined in wingdi.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24510 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/ms_hdr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/ms_hdr.h b/libmpdemux/ms_hdr.h index 6d388565f1..3ca0179ddc 100644 --- a/libmpdemux/ms_hdr.h +++ b/libmpdemux/ms_hdr.h @@ -26,7 +26,7 @@ typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag { } MPEGLAYER3WAVEFORMAT; #endif /* _MPEGLAYER3WAVEFORMAT_ */ -#ifndef _BITMAPINFOHEADER_ +#if !defined(_BITMAPINFOHEADER_) && !defined(_WINGDI_H) #define _BITMAPINFOHEADER_ typedef struct __attribute__((__packed__)) { |