[Mplayer-cvslog] CVS: main/loader/wine vfw.h, 1.12, 1.13 windef.h, 1.9, 1.10

[Dominik Mierzejewski CVS]

CVS change done by Dominik Mierzejewski CVS

Update of /cvsroot/mplayer/main/loader/wine
In directory mail:/var2/tmp/cvs-serv12446/wine

Modified Files:
	vfw.h windef.h 
Log Message:
loader gcc warning fixes and avifile sync


Index: vfw.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/wine/vfw.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vfw.h	9 Oct 2002 13:16:27 -0000	1.12
+++ vfw.h	28 Aug 2004 20:22:38 -0000	1.13
@@ -19,17 +19,17 @@
 #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;

Index: windef.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/wine/windef.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- windef.h	24 Apr 2003 18:48:30 -0000	1.9
+++ windef.h	28 Aug 2004 20:22:38 -0000	1.10
@@ -156,8 +156,8 @@
 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;