From 386cf6e342e6de36e23e8883cb45765dfddfb2d4 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Sun, 14 Oct 2001 16:25:47 +0000 Subject: [PATCH] When including 'wine/port.h', include it first. Remove redundant 'config.h' includes. --- controls/menu.c | 3 ++- dlls/dplayx/dplay.c | 4 +++- dlls/kernel/comm.c | 1 - dlls/odbc32/proxyodbc.c | 3 ++- dlls/winsock/async.c | 3 +-- dlls/winsock/socket.c | 3 +-- files/drive.c | 3 +-- library/port.c | 1 - loader/elf.c | 3 +-- loader/ne/module.c | 4 +++- loader/ne/resource.c | 4 +++- memory/global.c | 3 ++- memory/virtual.c | 3 +-- misc/cpu.c | 5 +++-- msdos/dosmem.c | 3 +-- msdos/dpmi.c | 4 ++-- scheduler/client.c | 3 +-- scheduler/sysdeps.c | 3 +-- scheduler/thread.c | 3 +-- server/request.c | 3 +-- tools/winebuild/spec16.c | 4 ++-- win32/device.c | 4 ++-- windows/class.c | 4 +++- windows/dialog.c | 3 ++- 24 files changed, 39 insertions(+), 38 deletions(-) diff --git a/controls/menu.c b/controls/menu.c index f15adeaf3be..50abd2ef33d 100644 --- a/controls/menu.c +++ b/controls/menu.c @@ -12,6 +12,8 @@ * This is probably not the meaning this style has in MS-Windows. */ +#include "wine/port.h" + #include #include #include @@ -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" diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 59a25365ec4..7bf65829c20 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -6,8 +6,10 @@ * */ -#include #include "wine/port.h" + +#include + #include "windef.h" #include "winerror.h" #include "winbase.h" diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c index 3c9f23f9eaf..3a98e24ee8c 100644 --- a/dlls/kernel/comm.c +++ b/dlls/kernel/comm.c @@ -32,7 +32,6 @@ * */ -#include "config.h" #include "wine/port.h" #include diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index e8ae92f0b0f..83a828760ce 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -9,6 +9,8 @@ * */ +#include "wine/port.h" + #include #include #include @@ -16,7 +18,6 @@ #include "winbase.h" #include "debugtools.h" -#include "wine/port.h" #include "sql.h" #include "sqltypes.h" diff --git a/dlls/winsock/async.c b/dlls/winsock/async.c index 062bacc3243..75dea387633 100644 --- a/dlls/winsock/async.c +++ b/dlls/winsock/async.c @@ -19,7 +19,7 @@ * whole stuff did not work anyway to other changes). */ -#include "config.h" +#include "wine/port.h" #include #include @@ -85,7 +85,6 @@ #include "ws2spi.h" #include "wine/winsock16.h" #include "winnt.h" -#include "wine/port.h" #include "debugtools.h" diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index 7b41bae3947..ffe31c32a1e 100644 --- a/dlls/winsock/socket.c +++ b/dlls/winsock/socket.c @@ -15,7 +15,7 @@ * ws_XXXXent32 (winsock2.h) and 1-byte forced ws_XXXXent16 (winsock16.h). */ -#include "config.h" +#include "wine/port.h" #include #include @@ -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" diff --git a/files/drive.c b/files/drive.c index 401af13177f..9a8882e6cfa 100644 --- a/files/drive.c +++ b/files/drive.c @@ -10,7 +10,7 @@ * */ -#include "config.h" +#include "wine/port.h" #include #include @@ -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" diff --git a/library/port.c b/library/port.c index d2c2c1bbe65..d20e321e7dc 100644 --- a/library/port.c +++ b/library/port.c @@ -4,7 +4,6 @@ * Copyright 1996 Alexandre Julliard */ -#include "config.h" #include "wine/port.h" #ifdef __BEOS__ diff --git a/loader/elf.c b/loader/elf.c index aa864acbd04..c93d418cd12 100644 --- a/loader/elf.c +++ b/loader/elf.c @@ -9,7 +9,7 @@ * IDEA(s): could be used to split up shell32,comctl32... */ -#include "config.h" +#include "wine/port.h" #include #include @@ -21,7 +21,6 @@ #include "module.h" #include "debugtools.h" #include "winerror.h" -#include "wine/port.h" DEFAULT_DEBUG_CHANNEL(win32); diff --git a/loader/ne/module.c b/loader/ne/module.c index 649d449b029..fc8b5b9fbbb 100644 --- a/loader/ne/module.c +++ b/loader/ne/module.c @@ -4,13 +4,15 @@ * Copyright 1995 Alexandre Julliard */ +#include "wine/port.h" + #include #include #include #include #include #include -#include "wine/port.h" + #include "wine/winbase16.h" #include "wine/library.h" #include "winerror.h" diff --git a/loader/ne/resource.c b/loader/ne/resource.c index 710b06309de..fdebb0d06b4 100644 --- a/loader/ne/resource.c +++ b/loader/ne/resource.c @@ -6,14 +6,16 @@ * Copyright 1997 Alex Korobka */ +#include "wine/port.h" + #include #include #include #include #include #include + #include "windef.h" -#include "wine/port.h" #include "wine/winbase16.h" #include "wine/library.h" #include "module.h" diff --git a/memory/global.c b/memory/global.c index 8a4ef73a534..d2f54cbbc0a 100644 --- a/memory/global.c +++ b/memory/global.c @@ -5,6 +5,8 @@ */ /* 0xffff sometimes seems to mean: CURRENT_DS */ +#include "wine/port.h" + #include #include #include @@ -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" diff --git a/memory/virtual.c b/memory/virtual.c index 8ec2b70f953..6fe46e9871a 100644 --- a/memory/virtual.c +++ b/memory/virtual.c @@ -4,7 +4,7 @@ * Copyright 1997 Alexandre Julliard */ -#include "config.h" +#include "wine/port.h" #include #include @@ -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" diff --git a/misc/cpu.c b/misc/cpu.c index 9cd9f0f3dca..ac1074e4a95 100644 --- a/misc/cpu.c +++ b/misc/cpu.c @@ -5,11 +5,12 @@ * Copyright 1997-1998 Marcus Meissner */ +#include "wine/port.h" + #include #include #include -#include "config.h" -#include "wine/port.h" + #include "winbase.h" #include "winreg.h" #include "winnt.h" diff --git a/msdos/dosmem.c b/msdos/dosmem.c index ec0ce122cbc..0bf62eec2bd 100644 --- a/msdos/dosmem.c +++ b/msdos/dosmem.c @@ -5,7 +5,7 @@ * Copyright 1996 Marcus Meissner */ -#include "config.h" +#include "wine/port.h" #include #include @@ -17,7 +17,6 @@ #include "winbase.h" #include "wine/winbase16.h" -#include "wine/port.h" #include "global.h" #include "selectors.h" diff --git a/msdos/dpmi.c b/msdos/dpmi.c index 7e74cea73b0..11b9bff95be 100644 --- a/msdos/dpmi.c +++ b/msdos/dpmi.c @@ -4,13 +4,13 @@ * Copyright 1995 Alexandre Julliard */ +#include "wine/port.h" + #include #include -#include "config.h" #include "windef.h" #include "wine/winbase16.h" -#include "wine/port.h" #include "builtin16.h" #include "miscemu.h" #include "msdos.h" diff --git a/scheduler/client.c b/scheduler/client.c index cda568d861f..f467948496b 100644 --- a/scheduler/client.c +++ b/scheduler/client.c @@ -4,7 +4,7 @@ * Copyright (C) 1998 Alexandre Julliard */ -#include "config.h" +#include "wine/port.h" #include #include @@ -30,7 +30,6 @@ #include #include -#include "wine/port.h" #include "thread.h" #include "wine/server.h" #include "winerror.h" diff --git a/scheduler/sysdeps.c b/scheduler/sysdeps.c index 9073cf797de..b931e779721 100644 --- a/scheduler/sysdeps.c +++ b/scheduler/sysdeps.c @@ -4,7 +4,7 @@ * Copyright 1998 Alexandre Julliard */ -#include "config.h" +#include "wine/port.h" #include #include @@ -20,7 +20,6 @@ #ifdef HAVE_UCONTEXT_H # include #endif -#include "wine/port.h" #include "thread.h" #include "wine/server.h" #include "winbase.h" diff --git a/scheduler/thread.c b/scheduler/thread.c index 0a413eca69c..b3ce6f3649b 100644 --- a/scheduler/thread.c +++ b/scheduler/thread.c @@ -4,7 +4,7 @@ * Copyright 1996 Alexandre Julliard */ -#include "config.h" +#include "wine/port.h" #include #include @@ -14,7 +14,6 @@ #endif #include #include "wine/winbase16.h" -#include "wine/port.h" #include "thread.h" #include "task.h" #include "module.h" diff --git a/server/request.c b/server/request.c index 6a5cca98c9b..1867ddf718c 100644 --- a/server/request.c +++ b/server/request.c @@ -4,7 +4,7 @@ * Copyright (C) 1998 Alexandre Julliard */ -#include "config.h" +#include "wine/port.h" #include #include @@ -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 diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index 214941e861c..12807fb11a9 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -8,11 +8,11 @@ * Copyright 1999 Ulrich Weigand */ +#include "wine/port.h" + #include #include -#include "config.h" -#include "wine/port.h" #include "wine/exception.h" #include "builtin16.h" #include "module.h" diff --git a/win32/device.c b/win32/device.c index 0ecaeb36190..d95d279c0de 100644 --- a/win32/device.c +++ b/win32/device.c @@ -7,7 +7,7 @@ * */ -#include "config.h" +#include "wine/port.h" #include #include @@ -15,7 +15,7 @@ #include #include #include -#include "wine/port.h" + #include "windef.h" #include "winbase.h" #include "winreg.h" diff --git a/windows/class.c b/windows/class.c index 0f01e7145fa..1ec779759c1 100644 --- a/windows/class.c +++ b/windows/class.c @@ -12,15 +12,17 @@ * classes are getting registered with wrong hInstance. */ +#include "wine/port.h" + #include #include + #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" diff --git a/windows/dialog.c b/windows/dialog.c index 3d30a7649d5..76551eed0af 100644 --- a/windows/dialog.c +++ b/windows/dialog.c @@ -4,6 +4,8 @@ * Copyright 1993, 1994, 1996 Alexandre Julliard */ +#include "wine/port.h" + #include #include #include @@ -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"