wine/port.h #include fixes
François Gouget
fgouget at codeweavers.com
Sat Oct 13 14:09:30 CDT 2001
This is a followup on the previous config.h patch, this time tackling
the wine/port.h case.
wine/port.h legitimately includes config.h.
This means that:
* it should be included first, just like config.h
* there is no need to include config.h too
Changelog:
François Gouget <fgouget at codeweavers.com>
* controls/menu.c,
dlls/dplayx/dplay.c,
dlls/odbc32/proxyodbc.c,
dlls/winsock/async.c,
dlls/winsock/socket.c,
files/drive.c,
library/port.c,
loader/elf.c,
loader/ne/module.c,
loader/ne/resource.c,
memory/global.c,
memory/virtual.c,
misc/cpu.c,
msdos/dosmem.c,
msdos/dpmi.c,
scheduler/client.c,
scheduler/sysdeps.c,
scheduler/thread.c,
server/request.c,
tools/winebuild/spec16.c,
win32/device.c,
windows/class.c,
windows/dialog.c,
dlls/kernel/comm.c
When including 'wine/port.h', include it first
Remove redundant 'config.h' includes
--
François Gouget
fgouget at codeweavers.com
-------------- next part --------------
Index: controls/menu.c
===================================================================
RCS file: /home/wine/wine/controls/menu.c,v
retrieving revision 1.130
diff -u -r1.130 menu.c
--- controls/menu.c 2001/09/19 20:37:04 1.130
+++ controls/menu.c 2001/10/13 17:09:41
@@ -12,6 +12,8 @@
* This is probably not the meaning this style has in MS-Windows.
*/
+#include "wine/port.h"
+
#include <assert.h>
#include <ctype.h>
#include <stdlib.h>
@@ -23,7 +25,6 @@
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "wine/unicode.h"
-#include "wine/port.h"
#include "win.h"
#include "controls.h"
#include "nonclient.h"
Index: dlls/dplayx/dplay.c
===================================================================
RCS file: /home/wine/wine/dlls/dplayx/dplay.c,v
retrieving revision 1.31
diff -u -r1.31 dplay.c
--- dlls/dplayx/dplay.c 2001/07/11 18:56:41 1.31
+++ dlls/dplayx/dplay.c 2001/10/13 17:09:52
@@ -6,8 +6,10 @@
*
*/
-#include <string.h>
#include "wine/port.h"
+
+#include <string.h>
+
#include "windef.h"
#include "winerror.h"
#include "winbase.h"
Index: dlls/odbc32/proxyodbc.c
===================================================================
RCS file: /home/wine/wine/dlls/odbc32/proxyodbc.c,v
retrieving revision 1.12
diff -u -r1.12 proxyodbc.c
--- dlls/odbc32/proxyodbc.c 2001/10/02 20:28:06 1.12
+++ dlls/odbc32/proxyodbc.c 2001/10/13 17:09:54
@@ -9,6 +9,8 @@
*
*/
+#include "wine/port.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -16,7 +18,6 @@
#include "winbase.h"
#include "debugtools.h"
-#include "wine/port.h"
#include "sql.h"
#include "sqltypes.h"
Index: dlls/winsock/async.c
===================================================================
RCS file: /home/wine/wine/dlls/winsock/async.c,v
retrieving revision 1.17
diff -u -r1.17 async.c
--- dlls/winsock/async.c 2001/10/09 21:48:22 1.17
+++ dlls/winsock/async.c 2001/10/13 17:10:00
@@ -19,7 +19,7 @@
* whole stuff did not work anyway to other changes).
*/
-#include "config.h"
+#include "wine/port.h"
#include <string.h>
#include <sys/types.h>
@@ -85,7 +85,6 @@
#include "ws2spi.h"
#include "wine/winsock16.h"
#include "winnt.h"
-#include "wine/port.h"
#include "debugtools.h"
Index: dlls/winsock/socket.c
===================================================================
RCS file: /home/wine/wine/dlls/winsock/socket.c,v
retrieving revision 1.64
diff -u -r1.64 socket.c
--- dlls/winsock/socket.c 2001/10/08 20:36:03 1.64
+++ dlls/winsock/socket.c 2001/10/13 17:10:01
@@ -15,7 +15,7 @@
* ws_XXXXent32 (winsock2.h) and 1-byte forced ws_XXXXent16 (winsock16.h).
*/
-#include "config.h"
+#include "wine/port.h"
#include <stdio.h>
#include <string.h>
@@ -95,7 +95,6 @@
#include "wine/winsock16.h"
#include "winnt.h"
#include "heap.h"
-#include "wine/port.h"
#include "services.h"
#include "wine/server.h"
#include "file.h"
Index: files/drive.c
===================================================================
RCS file: /home/wine/wine/files/drive.c,v
retrieving revision 1.61
diff -u -r1.61 drive.c
--- files/drive.c 2001/10/08 22:15:39 1.61
+++ files/drive.c 2001/10/13 17:10:04
@@ -10,7 +10,7 @@
*
*/
-#include "config.h"
+#include "wine/port.h"
#include <assert.h>
#include <ctype.h>
@@ -48,7 +48,6 @@
#include "heap.h"
#include "msdos.h"
#include "options.h"
-#include "wine/port.h"
#include "task.h"
#include "debugtools.h"
#include "wine/server.h"
Index: library/port.c
===================================================================
RCS file: /home/wine/wine/library/port.c,v
retrieving revision 1.16
diff -u -r1.16 port.c
--- library/port.c 2001/10/02 17:18:09 1.16
+++ library/port.c 2001/10/13 17:10:08
@@ -4,7 +4,6 @@
* Copyright 1996 Alexandre Julliard
*/
-#include "config.h"
#include "wine/port.h"
#ifdef __BEOS__
Index: loader/elf.c
===================================================================
RCS file: /home/wine/wine/loader/elf.c,v
retrieving revision 1.33
diff -u -r1.33 elf.c
--- loader/elf.c 2001/07/24 21:45:24 1.33
+++ loader/elf.c 2001/10/13 17:10:08
@@ -9,7 +9,7 @@
* IDEA(s): could be used to split up shell32,comctl32...
*/
-#include "config.h"
+#include "wine/port.h"
#include <assert.h>
#include <stdio.h>
@@ -21,7 +21,6 @@
#include "module.h"
#include "debugtools.h"
#include "winerror.h"
-#include "wine/port.h"
DEFAULT_DEBUG_CHANNEL(win32);
Index: loader/ne/module.c
===================================================================
RCS file: /home/wine/wine/loader/ne/module.c,v
retrieving revision 1.109
diff -u -r1.109 module.c
--- loader/ne/module.c 2001/07/30 19:01:02 1.109
+++ loader/ne/module.c 2001/10/13 17:10:11
@@ -4,13 +4,15 @@
* Copyright 1995 Alexandre Julliard
*/
+#include "wine/port.h"
+
#include <assert.h>
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <ctype.h>
-#include "wine/port.h"
+
#include "wine/winbase16.h"
#include "wine/library.h"
#include "winerror.h"
Index: loader/ne/resource.c
===================================================================
RCS file: /home/wine/wine/loader/ne/resource.c,v
retrieving revision 1.29
diff -u -r1.29 resource.c
--- loader/ne/resource.c 2001/08/10 22:49:36 1.29
+++ loader/ne/resource.c 2001/10/13 17:10:11
@@ -6,14 +6,16 @@
* Copyright 1997 Alex Korobka
*/
+#include "wine/port.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <fcntl.h>
#include <unistd.h>
+
#include "windef.h"
-#include "wine/port.h"
#include "wine/winbase16.h"
#include "wine/library.h"
#include "module.h"
Index: memory/global.c
===================================================================
RCS file: /home/wine/wine/memory/global.c,v
retrieving revision 1.56
diff -u -r1.56 global.c
--- memory/global.c 2001/07/25 00:43:36 1.56
+++ memory/global.c 2001/10/13 17:10:13
@@ -5,6 +5,8 @@
*/
/* 0xffff sometimes seems to mean: CURRENT_DS */
+#include "wine/port.h"
+
#include <sys/types.h>
#include <stdlib.h>
#include <time.h>
@@ -14,7 +16,6 @@
#include "wine/winbase16.h"
#include "wine/exception.h"
-#include "wine/port.h"
#include "global.h"
#include "toolhelp.h"
#include "selectors.h"
Index: memory/virtual.c
===================================================================
RCS file: /home/wine/wine/memory/virtual.c,v
retrieving revision 1.67
diff -u -r1.67 virtual.c
--- memory/virtual.c 2001/10/09 21:50:44 1.67
+++ memory/virtual.c 2001/10/13 17:10:15
@@ -4,7 +4,7 @@
* Copyright 1997 Alexandre Julliard
*/
-#include "config.h"
+#include "wine/port.h"
#include <assert.h>
#include <errno.h>
@@ -25,7 +25,6 @@
#include "wine/exception.h"
#include "wine/unicode.h"
#include "wine/library.h"
-#include "wine/port.h"
#include "winerror.h"
#include "file.h"
#include "global.h"
Index: misc/cpu.c
===================================================================
RCS file: /home/wine/wine/misc/cpu.c,v
retrieving revision 1.22
diff -u -r1.22 cpu.c
--- misc/cpu.c 2001/06/27 21:38:58 1.22
+++ misc/cpu.c 2001/10/13 17:10:15
@@ -5,11 +5,12 @@
* Copyright 1997-1998 Marcus Meissner
*/
+#include "wine/port.h"
+
#include <ctype.h>
#include <string.h>
#include <stdio.h>
-#include "config.h"
-#include "wine/port.h"
+
#include "winbase.h"
#include "winreg.h"
#include "winnt.h"
Index: msdos/dosmem.c
===================================================================
RCS file: /home/wine/wine/msdos/dosmem.c,v
retrieving revision 1.31
diff -u -r1.31 dosmem.c
--- msdos/dosmem.c 2000/12/13 20:20:19 1.31
+++ msdos/dosmem.c 2001/10/13 17:10:16
@@ -5,7 +5,7 @@
* Copyright 1996 Marcus Meissner
*/
-#include "config.h"
+#include "wine/port.h"
#include <signal.h>
#include <stdlib.h>
@@ -17,7 +17,6 @@
#include "winbase.h"
#include "wine/winbase16.h"
-#include "wine/port.h"
#include "global.h"
#include "selectors.h"
Index: msdos/dpmi.c
===================================================================
RCS file: /home/wine/wine/msdos/dpmi.c,v
retrieving revision 1.55
diff -u -r1.55 dpmi.c
--- msdos/dpmi.c 2001/06/20 23:03:18 1.55
+++ msdos/dpmi.c 2001/10/13 17:10:17
@@ -4,13 +4,13 @@
* Copyright 1995 Alexandre Julliard
*/
+#include "wine/port.h"
+
#include <unistd.h>
#include <string.h>
-#include "config.h"
#include "windef.h"
#include "wine/winbase16.h"
-#include "wine/port.h"
#include "builtin16.h"
#include "miscemu.h"
#include "msdos.h"
Index: scheduler/client.c
===================================================================
RCS file: /home/wine/wine/scheduler/client.c,v
retrieving revision 1.75
diff -u -r1.75 client.c
--- scheduler/client.c 2001/09/11 00:29:24 1.75
+++ scheduler/client.c 2001/10/13 17:10:19
@@ -4,7 +4,7 @@
* Copyright (C) 1998 Alexandre Julliard
*/
-#include "config.h"
+#include "wine/port.h"
#include <assert.h>
#include <ctype.h>
@@ -30,7 +30,6 @@
#include <unistd.h>
#include <stdarg.h>
-#include "wine/port.h"
#include "thread.h"
#include "wine/server.h"
#include "winerror.h"
Index: scheduler/sysdeps.c
===================================================================
RCS file: /home/wine/wine/scheduler/sysdeps.c,v
retrieving revision 1.37
diff -u -r1.37 sysdeps.c
--- scheduler/sysdeps.c 2001/07/24 00:58:52 1.37
+++ scheduler/sysdeps.c 2001/10/13 17:10:19
@@ -4,7 +4,7 @@
* Copyright 1998 Alexandre Julliard
*/
-#include "config.h"
+#include "wine/port.h"
#include <signal.h>
#include <stdio.h>
@@ -20,7 +20,6 @@
#ifdef HAVE_UCONTEXT_H
# include <ucontext.h>
#endif
-#include "wine/port.h"
#include "thread.h"
#include "wine/server.h"
#include "winbase.h"
Index: scheduler/thread.c
===================================================================
RCS file: /home/wine/wine/scheduler/thread.c,v
retrieving revision 1.108
diff -u -r1.108 thread.c
--- scheduler/thread.c 2001/10/03 18:39:23 1.108
+++ scheduler/thread.c 2001/10/13 17:10:20
@@ -4,7 +4,7 @@
* Copyright 1996 Alexandre Julliard
*/
-#include "config.h"
+#include "wine/port.h"
#include <assert.h>
#include <fcntl.h>
@@ -14,7 +14,6 @@
#endif
#include <unistd.h>
#include "wine/winbase16.h"
-#include "wine/port.h"
#include "thread.h"
#include "task.h"
#include "module.h"
Index: server/request.c
===================================================================
RCS file: /home/wine/wine/server/request.c,v
retrieving revision 1.55
diff -u -r1.55 request.c
--- server/request.c 2001/08/09 21:22:33 1.55
+++ server/request.c 2001/10/13 17:10:20
@@ -4,7 +4,7 @@
* Copyright (C) 1998 Alexandre Julliard
*/
-#include "config.h"
+#include "wine/port.h"
#include <assert.h>
#include <errno.h>
@@ -32,7 +32,6 @@
#include "process.h"
#define WANT_REQUEST_HANDLERS
#include "request.h"
-#include "wine/port.h"
/* Some versions of glibc don't define this */
#ifndef SCM_RIGHTS
Index: tools/winebuild/spec16.c
===================================================================
RCS file: /home/wine/wine/tools/winebuild/spec16.c,v
retrieving revision 1.21
diff -u -r1.21 spec16.c
--- tools/winebuild/spec16.c 2001/09/14 01:00:39 1.21
+++ tools/winebuild/spec16.c 2001/10/13 17:10:24
@@ -8,11 +8,11 @@
* Copyright 1999 Ulrich Weigand
*/
+#include "wine/port.h"
+
#include <assert.h>
#include <ctype.h>
-#include "config.h"
-#include "wine/port.h"
#include "wine/exception.h"
#include "builtin16.h"
#include "module.h"
Index: win32/device.c
===================================================================
RCS file: /home/wine/wine/win32/device.c,v
retrieving revision 1.54
diff -u -r1.54 device.c
--- win32/device.c 2001/10/02 17:49:21 1.54
+++ win32/device.c 2001/10/13 17:10:26
@@ -7,7 +7,7 @@
*
*/
-#include "config.h"
+#include "wine/port.h"
#include <stdlib.h>
#include <unistd.h>
@@ -15,7 +15,7 @@
#include <string.h>
#include <stdarg.h>
#include <time.h>
-#include "wine/port.h"
+
#include "windef.h"
#include "winbase.h"
#include "winreg.h"
Index: windows/class.c
===================================================================
RCS file: /home/wine/wine/windows/class.c,v
retrieving revision 1.38
diff -u -r1.38 class.c
--- windows/class.c 2001/10/09 23:27:17 1.38
+++ windows/class.c 2001/10/13 17:10:27
@@ -12,15 +12,17 @@
* classes are getting registered with wrong hInstance.
*/
+#include "wine/port.h"
+
#include <stdlib.h>
#include <string.h>
+
#include "wine/winbase16.h"
#include "winerror.h"
#include "windef.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "wine/unicode.h"
-#include "wine/port.h"
#include "heap.h"
#include "win.h"
#include "user.h"
Index: windows/dialog.c
===================================================================
RCS file: /home/wine/wine/windows/dialog.c,v
retrieving revision 1.92
diff -u -r1.92 dialog.c
--- windows/dialog.c 2001/09/19 20:37:05 1.92
+++ windows/dialog.c 2001/10/13 17:10:28
@@ -4,6 +4,8 @@
* Copyright 1993, 1994, 1996 Alexandre Julliard
*/
+#include "wine/port.h"
+
#include <ctype.h>
#include <errno.h>
#include <limits.h>
@@ -20,7 +22,6 @@
#include "wine/winuser16.h"
#include "wine/winbase16.h"
#include "wine/unicode.h"
-#include "wine/port.h"
#include "controls.h"
#include "heap.h"
#include "win.h"
Index: dlls/kernel/comm.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/comm.c,v
retrieving revision 1.39
diff -u -r1.39 comm.c
--- dlls/kernel/comm.c 2001/08/20 18:01:35 1.39
+++ dlls/kernel/comm.c 2001/10/13 17:21:14
@@ -32,7 +32,6 @@
*
*/
-#include "config.h"
#include "wine/port.h"
#include <stdlib.h>
More information about the wine-patches
mailing list