From 644c09f266f93781b4beefbe5b283207f1aa6db4 Mon Sep 17 00:00:00 2001 From: rathann Date: Sat, 28 Aug 2004 20:22:38 +0000 Subject: loader gcc warning fixes and avifile sync git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13183 b3059339-0415-0410-9bf9-f77b7e298cf2 --- loader/wine/vfw.h | 18 +++++++++--------- loader/wine/windef.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'loader/wine') diff --git a/loader/wine/vfw.h b/loader/wine/vfw.h index cfaf46ee8d..689e712ee3 100644 --- a/loader/wine/vfw.h +++ b/loader/wine/vfw.h @@ -19,17 +19,17 @@ typedef struct __attribute__((__packed__)) #define _BITMAPINFOHEADER_ typedef struct __attribute__((__packed__)) { - int biSize; - int biWidth; - int biHeight; + long biSize; + long biWidth; + long biHeight; short biPlanes; short biBitCount; - int biCompression; - int biSizeImage; - int biXPelsPerMeter; - int biYPelsPerMeter; - int biClrUsed; - int biClrImportant; + long biCompression; + long biSizeImage; + long biXPelsPerMeter; + long biYPelsPerMeter; + long biClrUsed; + long biClrImportant; } BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER; typedef struct { BITMAPINFOHEADER bmiHeader; diff --git a/loader/wine/windef.h b/loader/wine/windef.h index 51b1034eae..8d6a42e229 100644 --- a/loader/wine/windef.h +++ b/loader/wine/windef.h @@ -156,8 +156,8 @@ typedef void VOID; typedef int INT; typedef unsigned int UINT; typedef unsigned short WORD; -typedef unsigned int DWORD; -typedef unsigned int ULONG; +typedef unsigned long DWORD; +typedef unsigned long ULONG; typedef unsigned char BYTE; typedef long LONG; typedef short SHORT; -- cgit v1.2.3