diff options
| author | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-03-18 01:01:03 +0000 |
|---|---|---|
| committer | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-03-18 01:01:03 +0000 |
| commit | d71e31d0f702ebf8f872694f6e0f5d579c8378d3 (patch) | |
| tree | b8a816661c678a08769b45d34b394b1b5d04f134 /loader/wine | |
| parent | 52d76c5f328bdb0268d266b21f91aac571b443f6 (diff) | |
| download | mpv-d71e31d0f702ebf8f872694f6e0f5d579c8378d3.tar.bz2 mpv-d71e31d0f702ebf8f872694f6e0f5d579c8378d3.tar.xz | |
DLL loader updated from avifile-0.60beta4
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@129 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader/wine')
| -rw-r--r-- | loader/wine/vfw.h | 4 | ||||
| -rw-r--r-- | loader/wine/windef.h | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/loader/wine/vfw.h b/loader/wine/vfw.h index 2b79bbc73d..e60f83c502 100644 --- a/loader/wine/vfw.h +++ b/loader/wine/vfw.h @@ -15,6 +15,8 @@ typedef struct long bfOffBits; } BITMAPFILEHEADER; +#ifndef _BITMAPINFOHEADER_ +#define _BITMAPINFOHEADER_ typedef struct { long biSize; @@ -34,6 +36,8 @@ typedef struct { int bmiColors[1]; } BITMAPINFO, *LPBITMAPINFO; #endif + +#endif #define VFWAPI #define VFWAPIV #ifndef __WINE_WINDEF_H diff --git a/loader/wine/windef.h b/loader/wine/windef.h index 12338a754f..7596dae657 100644 --- a/loader/wine/windef.h +++ b/loader/wine/windef.h @@ -113,7 +113,7 @@ extern "C" { # define __RESTORE_ES __asm__ __volatile__("pushl %ds\n\tpopl %es") # endif # else -//# error You need gcc >= 2.7 to build Wine on a 386 +# error You need gcc >= 2.7 to build Wine on a 386 # endif #else # define __stdcall @@ -166,8 +166,8 @@ typedef unsigned short WCHAR; typedef int WIN_BOOL; typedef double DATE; typedef double DOUBLE; -typedef double LONGLONG; -typedef double ULONGLONG; +typedef long long LONGLONG; +typedef unsigned long long ULONGLONG; /* FIXME: Wine does not compile with strict on, therefore strict * handles are presently only usable on machines where sizeof(UINT) == |