Fix compile problems with wine including the wrong header files.

CVS patchset: 1695
CVS date: 2002/04/07 12:17:26

7 files changed, 42 insertions, 43 deletions

diff --git a/src/libw32dll/wine/elfdll.c b/src/libw32dll/wine/elfdll.c
index 5902502ba..fd4712fcd 100644
--- a/src/libw32dll/wine/elfdll.c
+++ b/src/libw32dll/wine/elfdll.c
@@ -7,12 +7,12 @@
 
 #ifdef HAVE_LIBDL
 
-#include <wine/windef.h>
-#include <wine/module.h>
-#include <wine/heap.h>
-#include <wine/elfdll.h>
-#include <wine/debugtools.h>
-#include <wine/winerror.h>
+#include "windef.h"
+#include "module.h"
+#include "heap.h"
+#include "elfdll.h"
+#include "debugtools.h"
+#include "winerror.h"
 
 //DEFAULT_DEBUG_CHANNEL(elfdll)
 
diff --git a/src/libw32dll/wine/ext.c b/src/libw32dll/wine/ext.c
index eb56db147..566143ea8 100644
--- a/src/libw32dll/wine/ext.c
+++ b/src/libw32dll/wine/ext.c
@@ -18,10 +18,10 @@
 #include <string.h>
 #include <stdarg.h>
 #include <ctype.h>
-#include <wine/windef.h>
-#include <wine/winbase.h>
-#include <wine/debugtools.h>
-#include <wine/heap.h>
+#include "windef.h"
+#include "winbase.h"
+#include "debugtools.h"
+#include "heap.h"
 #include "ext.h"
 
 #if 0
diff --git a/src/libw32dll/wine/module.c b/src/libw32dll/wine/module.c
index 1091db9f9..1f0cc923a 100644
--- a/src/libw32dll/wine/module.c
+++ b/src/libw32dll/wine/module.c
@@ -16,15 +16,15 @@
 #include <sys/types.h>
 
 
-#include <wine/windef.h>
-#include <wine/winerror.h>
-#include <wine/heap.h>
-#include <wine/module.h>
-#include <wine/pe_image.h>
-#include <wine/debugtools.h>
+#include "windef.h"
+#include "winerror.h"
+#include "heap.h"
+#include "module.h"
+#include "pe_image.h"
+#include "debugtools.h"
 #ifdef HAVE_LIBDL
 #include <dlfcn.h>
-#include <wine/elfdll.h>
+#include "elfdll.h"
 #endif
 #include "win32.h"
 #include "driver.h"
diff --git a/src/libw32dll/wine/pe_image.c b/src/libw32dll/wine/pe_image.c
index a90e821ce..c824933ad 100644
--- a/src/libw32dll/wine/pe_image.c
+++ b/src/libw32dll/wine/pe_image.c
@@ -34,7 +34,6 @@
  *   to 4096 byte boundaries on disk.
  */
 #include "config.h"
-//#include <wine/config.h>
 
 #include <errno.h>
 #include <assert.h>
@@ -48,13 +47,13 @@
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
-#include <wine/windef.h>
-#include <wine/winbase.h>
-#include <wine/winerror.h>
-#include <wine/heap.h>
-#include <wine/pe_image.h>
-#include <wine/module.h>
-#include <wine/debugtools.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "heap.h"
+#include "pe_image.h"
+#include "module.h"
+#include "debugtools.h"
 #include "ext.h"
 #include "win32.h"
 
diff --git a/src/libw32dll/wine/pe_resource.c b/src/libw32dll/wine/pe_resource.c
index e0dc60bd3..e9e9715f1 100644
--- a/src/libw32dll/wine/pe_resource.c
+++ b/src/libw32dll/wine/pe_resource.c
@@ -13,15 +13,15 @@
 
 #include <stdlib.h>
 #include <sys/types.h>
-#include <wine/winestring.h>
-#include <wine/windef.h>
-#include <wine/pe_image.h>
-#include <wine/module.h>
-#include <wine/heap.h>
+#include "winestring.h"
+#include "windef.h"
+#include "pe_image.h"
+#include "module.h"
+#include "heap.h"
 //#include "task.h"
 //#include "process.h"
 //#include "stackframe.h"
-#include <wine/debugtools.h>
+#include "debugtools.h"
 #include <ext.h>
 
 /**********************************************************************
diff --git a/src/libw32dll/wine/registry.c b/src/libw32dll/wine/registry.c
index 8201fc754..48ffec1a0 100644
--- a/src/libw32dll/wine/registry.c
+++ b/src/libw32dll/wine/registry.c
@@ -7,10 +7,10 @@
 #include <pwd.h>
 #include <sys/types.h>
 
-#include <wine/winbase.h>
-#include <wine/winreg.h>
-#include <wine/winnt.h>
-#include <wine/winerror.h>
+#include "winbase.h"
+#include "winreg.h"
+#include "winnt.h"
+#include "winerror.h"
 
 #include "ext.h"
 #include "registry.h"
diff --git a/src/libw32dll/wine/resource.c b/src/libw32dll/wine/resource.c
index aea094878..16e015e1f 100644
--- a/src/libw32dll/wine/resource.c
+++ b/src/libw32dll/wine/resource.c
@@ -14,14 +14,14 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <wine/winbase.h>
-#include <wine/windef.h>
-#include <wine/winuser.h>
-#include <wine/heap.h>
-#include <wine/module.h>
-#include <wine/debugtools.h>
-#include <wine/winerror.h>
-#include <loader.h>
+#include "winbase.h"
+#include "windef.h"
+#include "winuser.h"
+#include "heap.h"
+#include "module.h"
+#include "debugtools.h"
+#include "winerror.h"
+#include "loader.h"
 
 #define CP_ACP					0