Mercurial > mplayer.hg
comparison libmpdemux/ms_hdr.h @ 29036:69d26a2ce817
Check for _WINGDI_ instead of _WINGDI_H before defining BITMAPINFOHEADER
since former works on both 32 and 64 bit MinGW
| author | reimar |
|---|---|
| date | Fri, 27 Mar 2009 18:55:21 +0000 |
| parents | e53dac3c60ee |
| children | d643e4643313 |
comparison
equal
deleted
inserted
replaced
| 29035:dc02213118a4 | 29036:69d26a2ce817 |
|---|---|
| 25 unsigned short nCodecDelay; | 25 unsigned short nCodecDelay; |
| 26 } MPEGLAYER3WAVEFORMAT; | 26 } MPEGLAYER3WAVEFORMAT; |
| 27 #endif /* _MPEGLAYER3WAVEFORMAT_ */ | 27 #endif /* _MPEGLAYER3WAVEFORMAT_ */ |
| 28 | 28 |
| 29 /* windows.h #includes wingdi.h on MinGW. */ | 29 /* windows.h #includes wingdi.h on MinGW. */ |
| 30 #if !defined(_BITMAPINFOHEADER_) && !defined(_WINGDI_H) | 30 #if !defined(_BITMAPINFOHEADER_) && !defined(_WINGDI_) |
| 31 #define _BITMAPINFOHEADER_ | 31 #define _BITMAPINFOHEADER_ |
| 32 typedef struct __attribute__((__packed__)) | 32 typedef struct __attribute__((__packed__)) |
| 33 { | 33 { |
| 34 int biSize; | 34 int biSize; |
| 35 int biWidth; | 35 int biWidth; |