From a353d4e0556e850d212d70f7dd591a6d03871a0c Mon Sep 17 00:00:00 2001 From: zuxy Date: Sat, 15 Sep 2007 07:46:38 +0000 Subject: 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 --- libmpdemux/ms_hdr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmpdemux') 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__)) { -- cgit v1.2.3