config.h reorg part 2: config.h includes
François Gouget
fgouget at codeweavers.com
Wed Oct 31 23:52:24 CST 2001
This reorganisation was triggered by Solaris which keeps generating a
FILE_OFFSET_BITS redefinition warning each time config.h is included
after a system header.
But if you look at it in more details you realize that including
config.h after a system header is evil. If 'config.h' contains macros
that alter the way the system headers behave then it is clear that it
should be included before, and not after system headers.
But then it does not make any sense to include config.h from another
header. That's because then this header too would have to be included
before the system headers... except that sometimes they depend on system
headers themselves. So in order that things don't get too complex we can
follow these rules:
* if a source file includes "config.h" then "config.h" must be the
first header to be included
* no header should include "config.h"
* all headers that depend on "config.h" should contain the following
code:
#ifndef __WINE_CONFIG_H
# error You must include config.h to use this header
#endif
This way no one will forget to include "config.h" when using them.
I split this patch in two part:
* the first part fixes the order include and adds #include "config.h"
directives where necessary
* the second part modifies the headers to add the above #error code. So
obviously part one must be applied before part two. But at least it
makes it possible to just apply part one in case some pending patches
require adding additional #include "config.h" directives.
Changelog:
François Gouget <fgouget at codeweavers.com>
* console/xterm.c,
controls/menu.c,
dlls/dplayx/dplay.c,
dlls/kernel/comm.c,
dlls/msvcrt/msvcrt.h,
dlls/ntdll/misc.c,
dlls/odbc32/proxyodbc.c,
dlls/ttydrv/bitmap.c,
dlls/ttydrv/objects.c,
dlls/ttydrv/palette.c,
dlls/ttydrv/user.c,
dlls/winsock/async.c,
dlls/winsock/socket.c,
files/drive.c,
include/gdi.h,
include/heap.h,
include/thread.h,
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,
msdos/int10.c,
scheduler/client.c,
scheduler/sysdeps.c,
scheduler/thread.c,
server/request.c,
tools/winebuild/spec16.c,
tools/winebuild/utils.c,
tools/wrc/parser.l,
tools/wrc/ppl.l,
win32/device.c,
windows/class.c,
windows/dialog.c,
windows/x11drv/clipboard.c
Fix the #include order for config.h
Add #include "config.h" directives where needed
Fixes the FILE_OFFSET_BITS redefinition warnings on Solaris (part 2)
Changelog:
François Gouget <fgouget at codeweavers.com>
* include/config.h.in,
dlls/ttydrv/ttydrv.h,
dlls/winmm/wineoss/oss.h,
dlls/x11drv/dga2.h,
dlls/x11drv/x11ddraw.h,
dlls/x11drv/xvidmode.h,
include/cdrom.h,
include/console.h,
include/ts_shape.h,
include/ts_xf86dga.h,
include/ts_xf86dga2.h,
include/ts_xf86vmode.h,
include/ts_xlib.h,
include/ts_xpm.h,
include/ts_xrender.h,
include/ts_xresource.h,
include/ts_xshm.h,
include/ts_xutil.h,
include/ts_xvideo.h,
include/wine_gl.h,
include/x11drv.h,
include/wine/port.h,
tools/winebuild/build.h
Stop including "config.h" in headers
Require that config.h be included before
Fixes the FILE_OFFSET_BITS redefinition warnings on Solaris (part 3)
--
François Gouget
fgouget at codeweavers.com
-------------- next part --------------
Index: console/xterm.c
===================================================================
RCS file: /home/wine/wine/console/xterm.c,v
retrieving revision 1.16
diff -u -r1.16 xterm.c
--- console/xterm.c 2000/11/27 23:54:25 1.16
+++ console/xterm.c 2001/10/31 23:14:55
@@ -8,6 +8,8 @@
It does not currently support changing the title bar.
*/
+#include "config.h"
+
#include <stdlib.h>
#include <stdio.h>
#include <signal.h>
Index: controls/menu.c
===================================================================
RCS file: /home/wine/wine/controls/menu.c,v
retrieving revision 1.132
diff -u -r1.132 menu.c
--- controls/menu.c 2001/10/16 21:52:26 1.132
+++ controls/menu.c 2001/10/31 23:14:55
@@ -12,6 +12,7 @@
* This is probably not the meaning this style has in MS-Windows.
*/
+#include "config.h"
#include "wine/port.h"
#include <assert.h>
Index: dlls/dplayx/dplay.c
===================================================================
RCS file: /home/wine/wine/dlls/dplayx/dplay.c,v
retrieving revision 1.32
diff -u -r1.32 dplay.c
--- dlls/dplayx/dplay.c 2001/10/14 16:25:47 1.32
+++ dlls/dplayx/dplay.c 2001/10/31 23:14:56
@@ -6,6 +6,7 @@
*
*/
+#include "config.h"
#include "wine/port.h"
#include <string.h>
Index: dlls/kernel/comm.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/comm.c,v
retrieving revision 1.41
diff -u -r1.41 comm.c
--- dlls/kernel/comm.c 2001/10/21 15:01:20 1.41
+++ dlls/kernel/comm.c 2001/10/31 23:14:57
@@ -32,6 +32,7 @@
*
*/
+#include "config.h"
#include "wine/port.h"
#include <stdlib.h>
Index: dlls/msvcrt/msvcrt.h
===================================================================
RCS file: /home/wine/wine/dlls/msvcrt/msvcrt.h,v
retrieving revision 1.7
diff -u -r1.7 msvcrt.h
--- dlls/msvcrt/msvcrt.h 2001/07/23 23:50:18 1.7
+++ dlls/msvcrt/msvcrt.h 2001/10/31 23:14:57
@@ -1,15 +1,15 @@
#ifndef __WINE_MSVCRT_H
#define __WINE_MSVCRT_H
-#include "config.h"
+#include <stdarg.h>
+#include <ctype.h>
+#include <string.h>
+
#include "windef.h"
#include "debugtools.h"
#include "winbase.h"
#include "winerror.h"
#include "winnls.h"
-#include <stdarg.h>
-#include <ctype.h>
-#include <string.h>
/* TLS data */
extern DWORD MSVCRT_tls_index;
Index: dlls/ntdll/misc.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/misc.c,v
retrieving revision 1.11
diff -u -r1.11 misc.c
--- dlls/ntdll/misc.c 2001/07/26 21:41:22 1.11
+++ dlls/ntdll/misc.c 2001/10/31 23:14:57
@@ -1,10 +1,11 @@
/*
* Helper functions for ntdll
*/
-#include <time.h>
-#include <math.h>
#include "config.h"
+
+#include <time.h>
+#include <math.h>
#include "debugtools.h"
#include "ntdll_misc.h"
Index: dlls/odbc32/proxyodbc.c
===================================================================
RCS file: /home/wine/wine/dlls/odbc32/proxyodbc.c,v
retrieving revision 1.13
diff -u -r1.13 proxyodbc.c
--- dlls/odbc32/proxyodbc.c 2001/10/14 16:25:47 1.13
+++ dlls/odbc32/proxyodbc.c 2001/10/31 23:14:57
@@ -9,6 +9,7 @@
*
*/
+#include "config.h"
#include "wine/port.h"
#include <stdio.h>
Index: dlls/ttydrv/bitmap.c
===================================================================
RCS file: /home/wine/wine/dlls/ttydrv/bitmap.c,v
retrieving revision 1.8
diff -u -r1.8 bitmap.c
--- dlls/ttydrv/bitmap.c 2001/07/27 19:37:31 1.8
+++ dlls/ttydrv/bitmap.c 2001/10/31 23:14:57
@@ -4,7 +4,10 @@
* Copyright 1999 Patrik Stridvall
*/
+#include "config.h"
+
#include <string.h>
+
#include "bitmap.h"
#include "gdi.h"
#include "ttydrv.h"
Index: dlls/ttydrv/objects.c
===================================================================
RCS file: /home/wine/wine/dlls/ttydrv/objects.c,v
retrieving revision 1.6
diff -u -r1.6 objects.c
--- dlls/ttydrv/objects.c 2001/09/12 20:21:07 1.6
+++ dlls/ttydrv/objects.c 2001/10/31 23:14:57
@@ -4,6 +4,8 @@
* Copyright 1999 Patrik Stridvall
*/
+#include "config.h"
+
#include "bitmap.h"
#include "gdi.h"
#include "ttydrv.h"
Index: dlls/ttydrv/palette.c
===================================================================
RCS file: /home/wine/wine/dlls/ttydrv/palette.c,v
retrieving revision 1.3
diff -u -r1.3 palette.c
--- dlls/ttydrv/palette.c 2001/07/28 00:18:02 1.3
+++ dlls/ttydrv/palette.c 2001/10/31 23:14:57
@@ -4,6 +4,8 @@
* Copyright 1999 Patrik Stridvall
*/
+#include "config.h"
+
#include <stdlib.h>
#include "color.h"
Index: dlls/ttydrv/user.c
===================================================================
RCS file: /home/wine/wine/dlls/ttydrv/user.c,v
retrieving revision 1.10
diff -u -r1.10 user.c
--- dlls/ttydrv/user.c 2001/10/18 21:38:59 1.10
+++ dlls/ttydrv/user.c 2001/10/31 23:14:57
@@ -4,6 +4,8 @@
* Copyright 1998 Patrik Stridvall
*/
+#include "config.h"
+
#include "dinput.h"
#include "gdi.h"
#include "ttydrv.h"
Index: dlls/winsock/async.c
===================================================================
RCS file: /home/wine/wine/dlls/winsock/async.c,v
retrieving revision 1.18
diff -u -r1.18 async.c
--- dlls/winsock/async.c 2001/10/14 16:25:47 1.18
+++ dlls/winsock/async.c 2001/10/31 23:14:57
@@ -19,6 +19,7 @@
* whole stuff did not work anyway to other changes).
*/
+#include "config.h"
#include "wine/port.h"
#include <string.h>
Index: dlls/winsock/socket.c
===================================================================
RCS file: /home/wine/wine/dlls/winsock/socket.c,v
retrieving revision 1.65
diff -u -r1.65 socket.c
--- dlls/winsock/socket.c 2001/10/14 16:25:47 1.65
+++ dlls/winsock/socket.c 2001/10/31 23:14:57
@@ -15,6 +15,7 @@
* ws_XXXXent32 (winsock2.h) and 1-byte forced ws_XXXXent16 (winsock16.h).
*/
+#include "config.h"
#include "wine/port.h"
#include <stdio.h>
Index: files/drive.c
===================================================================
RCS file: /home/wine/wine/files/drive.c,v
retrieving revision 1.62
diff -u -r1.62 drive.c
--- files/drive.c 2001/10/14 16:25:47 1.62
+++ files/drive.c 2001/10/31 23:14:57
@@ -10,6 +10,7 @@
*
*/
+#include "config.h"
#include "wine/port.h"
#include <assert.h>
Index: include/gdi.h
===================================================================
RCS file: /home/wine/wine/include/gdi.h,v
retrieving revision 1.52
diff -u -r1.52 gdi.h
--- include/gdi.h 2001/09/12 20:21:07 1.52
+++ include/gdi.h 2001/10/31 23:14:57
@@ -7,8 +7,6 @@
#ifndef __WINE_GDI_H
#define __WINE_GDI_H
-#include "config.h"
-
#include "windef.h"
#include "wingdi.h"
#include "wine/wingdi16.h"
Index: include/heap.h
===================================================================
RCS file: /home/wine/wine/include/heap.h,v
retrieving revision 1.18
diff -u -r1.18 heap.h
--- include/heap.h 2001/07/24 21:45:24 1.18
+++ include/heap.h 2001/10/31 23:14:57
@@ -7,9 +7,8 @@
#ifndef __WINE_HEAP_H
#define __WINE_HEAP_H
-#include "config.h"
-
#include <string.h>
+
#include "winbase.h"
#include "winnls.h"
#include "wine/unicode.h"
Index: include/thread.h
===================================================================
RCS file: /home/wine/wine/include/thread.h,v
retrieving revision 1.54
diff -u -r1.54 thread.h
--- include/thread.h 2001/06/21 00:39:34 1.54
+++ include/thread.h 2001/10/31 23:14:57
@@ -7,8 +7,6 @@
#ifndef __WINE_THREAD_H
#define __WINE_THREAD_H
-#include "config.h"
-
#include "ntdef.h" /* UNICODE_STRING */
#include "wine/windef16.h"
Index: library/port.c
===================================================================
RCS file: /home/wine/wine/library/port.c,v
retrieving revision 1.17
diff -u -r1.17 port.c
--- library/port.c 2001/10/14 16:25:47 1.17
+++ library/port.c 2001/10/31 23:14:57
@@ -4,6 +4,7 @@
* 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.34
diff -u -r1.34 elf.c
--- loader/elf.c 2001/10/14 16:25:48 1.34
+++ loader/elf.c 2001/10/31 23:14:57
@@ -9,6 +9,7 @@
* IDEA(s): could be used to split up shell32,comctl32...
*/
+#include "config.h"
#include "wine/port.h"
#include <assert.h>
Index: loader/ne/module.c
===================================================================
RCS file: /home/wine/wine/loader/ne/module.c,v
retrieving revision 1.110
diff -u -r1.110 module.c
--- loader/ne/module.c 2001/10/14 16:25:48 1.110
+++ loader/ne/module.c 2001/10/31 23:14:57
@@ -4,6 +4,7 @@
* Copyright 1995 Alexandre Julliard
*/
+#include "config.h"
#include "wine/port.h"
#include <assert.h>
Index: loader/ne/resource.c
===================================================================
RCS file: /home/wine/wine/loader/ne/resource.c,v
retrieving revision 1.30
diff -u -r1.30 resource.c
--- loader/ne/resource.c 2001/10/14 16:25:48 1.30
+++ loader/ne/resource.c 2001/10/31 23:14:57
@@ -6,6 +6,7 @@
* Copyright 1997 Alex Korobka
*/
+#include "config.h"
#include "wine/port.h"
#include <stdio.h>
Index: memory/global.c
===================================================================
RCS file: /home/wine/wine/memory/global.c,v
retrieving revision 1.57
diff -u -r1.57 global.c
--- memory/global.c 2001/10/14 16:25:48 1.57
+++ memory/global.c 2001/10/31 23:14:58
@@ -5,6 +5,7 @@
*/
/* 0xffff sometimes seems to mean: CURRENT_DS */
+#include "config.h"
#include "wine/port.h"
#include <sys/types.h>
Index: memory/virtual.c
===================================================================
RCS file: /home/wine/wine/memory/virtual.c,v
retrieving revision 1.69
diff -u -r1.69 virtual.c
--- memory/virtual.c 2001/10/24 00:30:23 1.69
+++ memory/virtual.c 2001/10/31 23:14:58
@@ -4,6 +4,7 @@
* Copyright 1997 Alexandre Julliard
*/
+#include "config.h"
#include "wine/port.h"
#include <assert.h>
Index: misc/cpu.c
===================================================================
RCS file: /home/wine/wine/misc/cpu.c,v
retrieving revision 1.23
diff -u -r1.23 cpu.c
--- misc/cpu.c 2001/10/14 16:25:48 1.23
+++ misc/cpu.c 2001/10/31 23:14:58
@@ -5,6 +5,7 @@
* Copyright 1997-1998 Marcus Meissner
*/
+#include "config.h"
#include "wine/port.h"
#include <ctype.h>
Index: msdos/dosmem.c
===================================================================
RCS file: /home/wine/wine/msdos/dosmem.c,v
retrieving revision 1.32
diff -u -r1.32 dosmem.c
--- msdos/dosmem.c 2001/10/14 16:25:48 1.32
+++ msdos/dosmem.c 2001/10/31 23:14:58
@@ -5,6 +5,7 @@
* Copyright 1996 Marcus Meissner
*/
+#include "config.h"
#include "wine/port.h"
#include <signal.h>
Index: msdos/dpmi.c
===================================================================
RCS file: /home/wine/wine/msdos/dpmi.c,v
retrieving revision 1.56
diff -u -r1.56 dpmi.c
--- msdos/dpmi.c 2001/10/14 16:25:48 1.56
+++ msdos/dpmi.c 2001/10/31 23:14:58
@@ -4,6 +4,7 @@
* Copyright 1995 Alexandre Julliard
*/
+#include "config.h"
#include "wine/port.h"
#include <unistd.h>
Index: msdos/int10.c
===================================================================
RCS file: /home/wine/wine/msdos/int10.c,v
retrieving revision 1.33
diff -u -r1.33 int10.c
--- msdos/int10.c 2001/09/11 00:32:33 1.33
+++ msdos/int10.c 2001/10/31 23:14:58
@@ -2,7 +2,10 @@
* BIOS interrupt 10h handler
*/
+#include "config.h"
+
#include <stdlib.h>
+
#include "miscemu.h"
#include "vga.h"
#include "debugtools.h"
Index: scheduler/client.c
===================================================================
RCS file: /home/wine/wine/scheduler/client.c,v
retrieving revision 1.76
diff -u -r1.76 client.c
--- scheduler/client.c 2001/10/14 16:25:48 1.76
+++ scheduler/client.c 2001/10/31 23:14:58
@@ -4,6 +4,7 @@
* Copyright (C) 1998 Alexandre Julliard
*/
+#include "config.h"
#include "wine/port.h"
#include <assert.h>
Index: scheduler/sysdeps.c
===================================================================
RCS file: /home/wine/wine/scheduler/sysdeps.c,v
retrieving revision 1.38
diff -u -r1.38 sysdeps.c
--- scheduler/sysdeps.c 2001/10/14 16:25:48 1.38
+++ scheduler/sysdeps.c 2001/10/31 23:14:58
@@ -4,6 +4,7 @@
* Copyright 1998 Alexandre Julliard
*/
+#include "config.h"
#include "wine/port.h"
#include <signal.h>
Index: scheduler/thread.c
===================================================================
RCS file: /home/wine/wine/scheduler/thread.c,v
retrieving revision 1.109
diff -u -r1.109 thread.c
--- scheduler/thread.c 2001/10/14 16:25:48 1.109
+++ scheduler/thread.c 2001/10/31 23:14:58
@@ -4,6 +4,7 @@
* Copyright 1996 Alexandre Julliard
*/
+#include "config.h"
#include "wine/port.h"
#include <assert.h>
Index: server/request.c
===================================================================
RCS file: /home/wine/wine/server/request.c,v
retrieving revision 1.57
diff -u -r1.57 request.c
--- server/request.c 2001/10/17 17:48:49 1.57
+++ server/request.c 2001/10/31 23:14:58
@@ -4,6 +4,7 @@
* Copyright (C) 1998 Alexandre Julliard
*/
+#include "config.h"
#include "wine/port.h"
#include <assert.h>
Index: tools/winebuild/spec16.c
===================================================================
RCS file: /home/wine/wine/tools/winebuild/spec16.c,v
retrieving revision 1.22
diff -u -r1.22 spec16.c
--- tools/winebuild/spec16.c 2001/10/14 16:25:48 1.22
+++ tools/winebuild/spec16.c 2001/10/31 23:14:58
@@ -8,6 +8,7 @@
* Copyright 1999 Ulrich Weigand
*/
+#include "config.h"
#include "wine/port.h"
#include <assert.h>
Index: tools/winebuild/utils.c
===================================================================
RCS file: /home/wine/wine/tools/winebuild/utils.c,v
retrieving revision 1.5
diff -u -r1.5 utils.c
--- tools/winebuild/utils.c 2001/02/13 02:06:38 1.5
+++ tools/winebuild/utils.c 2001/10/31 23:14:58
@@ -1,5 +1,7 @@
/* small utility functions for winebuild */
+#include "config.h"
+
#include <ctype.h>
#include <stdarg.h>
#include <stdio.h>
Index: tools/wrc/parser.l
===================================================================
RCS file: /home/wine/wine/tools/wrc/parser.l,v
retrieving revision 1.17
diff -u -r1.17 parser.l
--- tools/wrc/parser.l 2001/06/06 21:04:07 1.17
+++ tools/wrc/parser.l 2001/10/31 23:14:59
@@ -79,8 +79,6 @@
/*#define LEX_DEBUG*/
-#include "config.h"
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Index: tools/wrc/ppl.l
===================================================================
RCS file: /home/wine/wine/tools/wrc/ppl.l,v
retrieving revision 1.5
diff -u -r1.5 ppl.l
--- tools/wrc/ppl.l 2001/06/04 03:09:11 1.5
+++ tools/wrc/ppl.l 2001/10/31 23:14:59
@@ -138,8 +138,6 @@
ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL]
%{
-#include "config.h"
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Index: win32/device.c
===================================================================
RCS file: /home/wine/wine/win32/device.c,v
retrieving revision 1.55
diff -u -r1.55 device.c
--- win32/device.c 2001/10/14 16:25:48 1.55
+++ win32/device.c 2001/10/31 23:14:59
@@ -7,6 +7,7 @@
*
*/
+#include "config.h"
#include "wine/port.h"
#include <stdlib.h>
Index: windows/class.c
===================================================================
RCS file: /home/wine/wine/windows/class.c,v
retrieving revision 1.40
diff -u -r1.40 class.c
--- windows/class.c 2001/10/15 17:56:45 1.40
+++ windows/class.c 2001/10/31 23:14:59
@@ -12,6 +12,7 @@
* classes are getting registered with wrong hInstance.
*/
+#include "config.h"
#include "wine/port.h"
#include <stdlib.h>
Index: windows/dialog.c
===================================================================
RCS file: /home/wine/wine/windows/dialog.c,v
retrieving revision 1.94
diff -u -r1.94 dialog.c
--- windows/dialog.c 2001/10/15 17:56:45 1.94
+++ windows/dialog.c 2001/10/31 23:14:59
@@ -4,6 +4,7 @@
* Copyright 1993, 1994, 1996 Alexandre Julliard
*/
+#include "config.h"
#include "wine/port.h"
#include <ctype.h>
Index: windows/x11drv/clipboard.c
===================================================================
RCS file: /home/wine/wine/windows/x11drv/clipboard.c,v
retrieving revision 1.40
diff -u -r1.40 clipboard.c
--- windows/x11drv/clipboard.c 2001/10/12 18:41:50 1.40
+++ windows/x11drv/clipboard.c 2001/10/31 23:14:59
@@ -45,7 +45,7 @@
*
*/
-#include "ts_xlib.h"
+#include "config.h"
#include <string.h>
#include <stdio.h>
@@ -53,6 +53,7 @@
#include <unistd.h>
#include <fcntl.h>
+#include "ts_xlib.h"
#include "winreg.h"
#include "clipboard.h"
#include "win.h"
-------------- next part --------------
Index: include/config.h.in
===================================================================
RCS file: /home/wine/wine/include/config.h.in,v
retrieving revision 1.89
diff -u -r1.89 config.h.in
--- include/config.h.in 2001/10/23 20:06:33 1.89
+++ include/config.h.in 2001/10/31 23:14:57
@@ -1,5 +1,8 @@
/* include/config.h.in. Generated automatically from configure.in by autoheader 2.13. */
+#ifndef __WINE_CONFIG_H
+#define __WINE_CONFIG_H
+
/* Define if using alloca.c. */
#undef C_ALLOCA
@@ -544,3 +541,4 @@
/* Define if struct sockaddr_un contains sun_len */
#undef HAVE_SOCKADDR_SUN_LEN
+#endif /* __WINE_CONFIG_H */
Index: dlls/ttydrv/ttydrv.h
===================================================================
RCS file: /home/wine/wine/dlls/ttydrv/ttydrv.h,v
retrieving revision 1.13
diff -u -r1.13 ttydrv.h
--- dlls/ttydrv/ttydrv.h 2001/10/18 21:38:59 1.13
+++ dlls/ttydrv/ttydrv.h 2001/10/31 23:14:57
@@ -5,7 +5,9 @@
#ifndef __WINE_TTYDRV_H
#define __WINE_TTYDRV_H
-#include "config.h"
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
#undef ERR
#ifdef HAVE_NCURSES_H
Index: dlls/winmm/wineoss/oss.h
===================================================================
RCS file: /home/wine/wine/dlls/winmm/wineoss/oss.h,v
retrieving revision 1.3
diff -u -r1.3 oss.h
--- dlls/winmm/wineoss/oss.h 2000/11/26 04:04:21 1.3
+++ dlls/winmm/wineoss/oss.h 2001/10/31 23:14:57
@@ -1,6 +1,8 @@
/* Definition for OSS drivers : wine multimedia system */
-#include "config.h"
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
#if defined(HAVE_SYS_SOUNDCARD_H)
# include <sys/soundcard.h>
Index: dlls/x11drv/dga2.h
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/dga2.h,v
retrieving revision 1.1
diff -u -r1.1 dga2.h
--- dlls/x11drv/dga2.h 2001/04/16 19:54:07 1.1
+++ dlls/x11drv/dga2.h 2001/10/31 23:14:57
@@ -5,7 +5,11 @@
*/
#ifndef __WINE_DGA2_H
#define __WINE_DGA2_H
-#include "config.h"
+
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
+
#ifdef HAVE_LIBXXF86DGA2
#include "ddrawi.h"
Index: dlls/x11drv/x11ddraw.h
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/x11ddraw.h,v
retrieving revision 1.2
diff -u -r1.2 x11ddraw.h
--- dlls/x11drv/x11ddraw.h 2001/04/16 19:54:07 1.2
+++ dlls/x11drv/x11ddraw.h 2001/10/31 23:14:57
@@ -5,7 +5,11 @@
*/
#ifndef __WINE_X11DDRAW_H
#define __WINE_X11DDRAW_H
-#include "config.h"
+
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
+
#include "ddrawi.h"
extern LPDDRAWI_DDRAWSURFACE_LCL X11DRV_DD_Primary;
Index: dlls/x11drv/xvidmode.h
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/xvidmode.h,v
retrieving revision 1.2
diff -u -r1.2 xvidmode.h
--- dlls/x11drv/xvidmode.h 2001/03/20 01:24:08 1.2
+++ dlls/x11drv/xvidmode.h 2001/10/31 23:14:57
@@ -5,7 +5,11 @@
*/
#ifndef __WINE_XVIDMODE_H
#define __WINE_XVIDMODE_H
-#include "config.h"
+
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
+
#ifdef HAVE_LIBXXF86VM
#include "ddrawi.h"
Index: include/cdrom.h
===================================================================
RCS file: /home/wine/wine/include/cdrom.h,v
retrieving revision 1.13
diff -u -r1.13 cdrom.h
--- include/cdrom.h 2000/11/26 04:04:22 1.13
+++ include/cdrom.h 2001/10/31 23:14:57
@@ -10,9 +10,12 @@
#ifndef __WINE_CDROM_H__
#define __WINE_CDROM_H__
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
+
#include <stdlib.h>
#include <unistd.h>
-#include "config.h"
#include "windef.h"
#include "wine/windef16.h"
Index: include/console.h
===================================================================
RCS file: /home/wine/wine/include/console.h,v
retrieving revision 1.16
diff -u -r1.16 console.h
--- include/console.h 2000/02/19 20:50:01 1.16
+++ include/console.h 2001/10/31 23:14:57
@@ -8,8 +8,11 @@
#ifndef __WINE_CONSOLE_H
#define __WINE_CONSOLE_H
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
+
#include <stdio.h>
-#include "config.h"
/* Can we compile with curses/ncurses? */
#if ( (defined(HAVE_LIBNCURSES) || defined(HAVE_LIBCURSES)) && \
Index: include/ts_shape.h
===================================================================
RCS file: /home/wine/wine/include/ts_shape.h,v
retrieving revision 1.2
diff -u -r1.2 ts_shape.h
--- include/ts_shape.h 2000/12/06 00:04:11 1.2
+++ include/ts_shape.h 2001/10/31 23:14:57
@@ -9,7 +9,9 @@
#ifndef __WINE_TS_SHAPE_H
#define __WINE_TS_SHAPE_H
-#include "config.h"
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
#ifdef HAVE_LIBXSHAPE
#include <X11/IntrinsicP.h>
Index: include/ts_xf86dga.h
===================================================================
RCS file: /home/wine/wine/include/ts_xf86dga.h,v
retrieving revision 1.5
diff -u -r1.5 ts_xf86dga.h
--- include/ts_xf86dga.h 2000/12/06 00:04:11 1.5
+++ include/ts_xf86dga.h 2001/10/31 23:14:57
@@ -9,7 +9,9 @@
#ifndef __WINE_TS_XF86DGA_H
#define __WINE_TS_XF86DGA_H
-#include "config.h"
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
#ifdef HAVE_LIBXXF86DGA
Index: include/ts_xf86dga2.h
===================================================================
RCS file: /home/wine/wine/include/ts_xf86dga2.h,v
retrieving revision 1.3
diff -u -r1.3 ts_xf86dga2.h
--- include/ts_xf86dga2.h 2000/12/06 00:04:11 1.3
+++ include/ts_xf86dga2.h 2001/10/31 23:14:57
@@ -9,7 +9,9 @@
#ifndef __WINE_TS_XF86DGA2_H
#define __WINE_TS_XF86DGA2_H
-#include "config.h"
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
#ifdef HAVE_LIBXXF86DGA2
Index: include/ts_xf86vmode.h
===================================================================
RCS file: /home/wine/wine/include/ts_xf86vmode.h,v
retrieving revision 1.8
diff -u -r1.8 ts_xf86vmode.h
--- include/ts_xf86vmode.h 2000/12/06 00:04:11 1.8
+++ include/ts_xf86vmode.h 2001/10/31 23:14:57
@@ -9,7 +9,9 @@
#ifndef __WINE_TS_XF86VMODE_H
#define __WINE_TS_XF86VMODE_H
-#include "config.h"
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
#include "windef.h"
#ifdef HAVE_LIBXXF86VM
Index: include/ts_xlib.h
===================================================================
RCS file: /home/wine/wine/include/ts_xlib.h,v
retrieving revision 1.16
diff -u -r1.16 ts_xlib.h
--- include/ts_xlib.h 2001/04/16 19:33:25 1.16
+++ include/ts_xlib.h 2001/10/31 23:14:57
@@ -9,8 +9,9 @@
#ifndef __WINE_TS_XLIB_H
#define __WINE_TS_XLIB_H
-#include "config.h"
-
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
#include <X11/Xlib.h>
Index: include/ts_xpm.h
===================================================================
RCS file: /home/wine/wine/include/ts_xpm.h,v
retrieving revision 1.5
diff -u -r1.5 ts_xpm.h
--- include/ts_xpm.h 2000/12/06 00:04:11 1.5
+++ include/ts_xpm.h 2001/10/31 23:14:57
@@ -9,7 +9,9 @@
#ifndef __WINE_TS_XPM_H
#define __WINE_TS_XPM_H
-#include "config.h"
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
#ifdef HAVE_LIBXXPM
Index: include/ts_xrender.h
===================================================================
RCS file: /home/wine/wine/include/ts_xrender.h,v
retrieving revision 1.1
diff -u -r1.1 ts_xrender.h
--- include/ts_xrender.h 2001/09/14 01:04:25 1.1
+++ include/ts_xrender.h 2001/10/31 23:14:57
@@ -9,7 +9,9 @@
#ifndef __WINE_TS_XRENDER_H
#define __WINE_TS_XRENDER_H
-#include "config.h"
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
#ifdef HAVE_LIBXRENDER
Index: include/ts_xresource.h
===================================================================
RCS file: /home/wine/wine/include/ts_xresource.h,v
retrieving revision 1.5
diff -u -r1.5 ts_xresource.h
--- include/ts_xresource.h 2000/12/06 00:04:11 1.5
+++ include/ts_xresource.h 2001/10/31 23:14:57
@@ -9,8 +9,9 @@
#ifndef __WINE_TS_XRESOURCE_H
#define __WINE_TS_XRESOURCE_H
-#include "config.h"
-
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
#include <X11/Xlib.h>
#include <X11/Xresource.h>
Index: include/ts_xshm.h
===================================================================
RCS file: /home/wine/wine/include/ts_xshm.h,v
retrieving revision 1.6
diff -u -r1.6 ts_xshm.h
--- include/ts_xshm.h 2000/12/06 00:04:11 1.6
+++ include/ts_xshm.h 2001/10/31 23:14:57
@@ -9,7 +9,9 @@
#ifndef __WINE_TS_XSHM_H
#define __WINE_TS_XSHM_H
-#include "config.h"
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
#ifdef HAVE_LIBXXSHM
Index: include/ts_xutil.h
===================================================================
RCS file: /home/wine/wine/include/ts_xutil.h,v
retrieving revision 1.8
diff -u -r1.8 ts_xutil.h
--- include/ts_xutil.h 2000/12/06 00:04:11 1.8
+++ include/ts_xutil.h 2001/10/31 23:14:57
@@ -9,8 +9,9 @@
#ifndef __WINE_TS_XUTIL_H
#define __WINE_TS_XUTIL_H
-#include "config.h"
-
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
#include <X11/Xlib.h>
#include <X11/Xresource.h>
Index: include/ts_xvideo.h
===================================================================
RCS file: /home/wine/wine/include/ts_xvideo.h,v
retrieving revision 1.2
diff -u -r1.2 ts_xvideo.h
--- include/ts_xvideo.h 2000/12/06 00:04:11 1.2
+++ include/ts_xvideo.h 2001/10/31 23:14:57
@@ -9,7 +9,9 @@
#ifndef __WINE_TS_XVIDEO_H
#define __WINE_TS_XVIDEO_H
-#include "config.h"
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
#ifdef HAVE_XVIDEO
Index: include/wine_gl.h
===================================================================
RCS file: /home/wine/wine/include/wine_gl.h,v
retrieving revision 1.10
diff -u -r1.10 wine_gl.h
--- include/wine_gl.h 2001/07/22 23:42:09 1.10
+++ include/wine_gl.h 2001/10/31 23:14:57
@@ -7,7 +7,9 @@
#ifndef __WINE_WINE_GL_H
#define __WINE_WINE_GL_H
-#include "config.h"
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
#if defined(HAVE_OPENGL)
Index: include/x11drv.h
===================================================================
RCS file: /home/wine/wine/include/x11drv.h,v
retrieving revision 1.93
diff -u -r1.93 x11drv.h
--- include/x11drv.h 2001/10/18 21:38:59 1.93
+++ include/x11drv.h 2001/10/31 23:14:57
@@ -5,7 +5,9 @@
#ifndef __WINE_X11DRV_H
#define __WINE_X11DRV_H
-#include "config.h"
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
#include <X11/Xlib.h>
#include <X11/Xresource.h>
Index: include/wine/port.h
===================================================================
RCS file: /home/wine/wine/include/wine/port.h,v
retrieving revision 1.15
diff -u -r1.15 port.h
--- include/wine/port.h 2001/07/26 21:43:29 1.15
+++ include/wine/port.h 2001/10/31 23:14:57
@@ -6,7 +6,9 @@
#ifndef __WINE_WINE_PORT_H
#define __WINE_WINE_PORT_H
-#include "config.h"
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
#include <fcntl.h>
#include <sys/types.h>
Index: tools/winebuild/build.h
===================================================================
RCS file: /home/wine/wine/tools/winebuild/build.h,v
retrieving revision 1.19
diff -u -r1.19 build.h
--- tools/winebuild/build.h 2001/06/08 19:02:58 1.19
+++ tools/winebuild/build.h 2001/10/31 23:14:58
@@ -9,7 +9,10 @@
#ifndef __WINE_BUILD_H
#define __WINE_BUILD_H
-#include "config.h"
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
+
#include <stdio.h>
#include <stdlib.h>
More information about the wine-patches
mailing list