Fix some compiler warnings.

CVS patchset: 7895
CVS date: 2006/02/14 18:45:37

5 files changed, 5 insertions, 2 deletions

diff --git a/src/libw32dll/wine/elfdll.c b/src/libw32dll/wine/elfdll.c
index 7051c1802..7853ffe71 100644
--- a/src/libw32dll/wine/elfdll.c
+++ b/src/libw32dll/wine/elfdll.c
@@ -13,6 +13,7 @@
 #include "elfdll.h"
 #include "debugtools.h"
 #include "winerror.h"
+#include "ext.h"
 
 //DEFAULT_DEBUG_CHANNEL(elfdll)
 
diff --git a/src/libw32dll/wine/ext.c b/src/libw32dll/wine/ext.c
index da1ac7149..8a791cab9 100644
--- a/src/libw32dll/wine/ext.c
+++ b/src/libw32dll/wine/ext.c
@@ -469,7 +469,7 @@ LPVOID WINAPI VirtualAlloc(LPVOID address, DWORD size, DWORD type,  DWORD protec
 
     if (type&MEM_RESERVE && (unsigned)address&0xffff) {
        size += (unsigned)address&0xffff;
-       address = (unsigned)address & ~0xffff;
+       address = (LPVOID)((unsigned)address & ~0xffff);
     }
     pgsz = sysconf(_SC_PAGESIZE);
     if (type&MEM_COMMIT && (unsigned)address%pgsz) {
diff --git a/src/libw32dll/wine/ext.h b/src/libw32dll/wine/ext.h
index c8051e4f3..7b284ca79 100644
--- a/src/libw32dll/wine/ext.h
+++ b/src/libw32dll/wine/ext.h
@@ -9,6 +9,6 @@ extern LPVOID FILE_dommap( int unix_handle, LPVOID start,
 			   int prot, int flags );
 extern int FILE_munmap( LPVOID start, DWORD size_high, DWORD size_low );
 extern int wcsnicmp(const unsigned short* s1, const unsigned short* s2, int n);
-extern int __vprintf( const char *format, ... );
+extern int __attribute__ ((format (printf, 1, 2))) __vprintf( const char *format, ... );
 
 #endif
diff --git a/src/libw32dll/wine/module.c b/src/libw32dll/wine/module.c
index af7f9abcd..bc943d0d6 100644
--- a/src/libw32dll/wine/module.c
+++ b/src/libw32dll/wine/module.c
@@ -35,6 +35,7 @@
 #endif
 #include "win32.h"
 #include "driver.h"
+#include "ext.h"
 
 #ifdef EMU_QTX_API
 #include "wrapper.h"
diff --git a/src/libw32dll/wine/resource.c b/src/libw32dll/wine/resource.c
index 4faa71e6e..9d4fa80bb 100644
--- a/src/libw32dll/wine/resource.c
+++ b/src/libw32dll/wine/resource.c
@@ -22,6 +22,7 @@
 #include "debugtools.h"
 #include "winerror.h"
 #include "loader.h"
+#include "ext.h"
 
 #define CP_ACP					0