From 1425941e290a89c3e82e8db01b9d8a615e780500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Gouget?= Date: Tue, 6 Nov 2001 20:57:11 +0000 Subject: [PATCH] Fix the #include order for config.h. Add #include "config.h" directives where needed. --- configure | 5 +++++ configure.in | 3 +++ console/xterm.c | 2 ++ controls/menu.c | 1 + dlls/ddraw/mesa.c | 2 ++ dlls/dplayx/dplay.c | 1 + dlls/kernel/comm.c | 1 + dlls/msvcrt/msvcrt.h | 8 ++++---- dlls/ntdll/misc.c | 5 +++-- dlls/odbc32/proxyodbc.c | 1 + dlls/ttydrv/bitmap.c | 3 +++ dlls/ttydrv/objects.c | 2 ++ dlls/ttydrv/palette.c | 2 ++ dlls/ttydrv/ttydrv.h | 4 +++- dlls/ttydrv/user.c | 2 ++ dlls/winmm/wineoss/oss.h | 4 +++- dlls/winsock/async.c | 1 + dlls/winsock/socket.c | 1 + dlls/x11drv/dga2.h | 6 +++++- dlls/x11drv/x11ddraw.h | 6 +++++- dlls/x11drv/xvidmode.h | 6 +++++- files/drive.c | 1 + include/cdrom.h | 5 ++++- include/config.h.in | 3 +++ include/console.h | 5 ++++- include/gdi.h | 2 -- include/heap.h | 3 +-- include/thread.h | 2 -- include/ts_shape.h | 7 ++++--- include/ts_xf86dga.h | 7 ++++--- include/ts_xf86dga2.h | 7 ++++--- include/ts_xf86vmode.h | 7 ++++--- include/ts_xlib.h | 7 ++++--- include/ts_xpm.h | 7 ++++--- include/ts_xrender.h | 7 ++++--- include/ts_xresource.h | 7 ++++--- include/ts_xshm.h | 7 ++++--- include/ts_xutil.h | 9 +++++---- include/ts_xvideo.h | 7 ++++--- include/wine/port.h | 4 +++- include/wine_gl.h | 4 +++- include/x11drv.h | 4 +++- library/port.c | 1 + loader/elf.c | 1 + loader/ne/module.c | 1 + loader/ne/resource.c | 1 + memory/global.c | 1 + memory/virtual.c | 1 + misc/cpu.c | 1 + msdos/dosmem.c | 3 ++- msdos/dpmi.c | 1 + msdos/int10.c | 3 +++ scheduler/client.c | 1 + scheduler/sysdeps.c | 1 + scheduler/thread.c | 1 + server/request.c | 1 + tools/make_X11wrappers | 7 ++++--- tools/winebuild/build.h | 5 ++++- tools/winebuild/spec16.c | 1 + tools/winebuild/utils.c | 2 ++ tools/wrc/parser.l | 2 -- tools/wrc/ppl.l | 2 -- win32/device.c | 1 + windows/class.c | 1 + windows/dialog.c | 1 + windows/x11drv/clipboard.c | 3 ++- 66 files changed, 155 insertions(+), 66 deletions(-) diff --git a/configure b/configure index 81f50aa9bef..75249b4f388 100755 --- a/configure +++ b/configure @@ -6925,6 +6925,11 @@ fi +cat >> confdefs.h <<\EOF +#define __WINE_CONFIG_H 1 +EOF + + MAKE_RULES=Make.rules diff --git a/configure.in b/configure.in index 749d7f72a96..daab697685e 100644 --- a/configure.in +++ b/configure.in @@ -1182,6 +1182,9 @@ AC_SUBST(GCC_NO_BUILTIN) dnl **** Generate output files **** +AC_DEFINE(__WINE_CONFIG_H, 1, + [This must always be defined to allow checking for config.h inclusion]) + AC_OUTPUT_COMMANDS([ extra_subdirs="\ dlls/ddraw/d3ddevice \ diff --git a/console/xterm.c b/console/xterm.c index 38da3737819..4b56418d611 100644 --- a/console/xterm.c +++ b/console/xterm.c @@ -8,6 +8,8 @@ It does not currently support changing the title bar. */ +#include "config.h" + #include #include #include diff --git a/controls/menu.c b/controls/menu.c index 931d438e349..36ffec8db22 100644 --- a/controls/menu.c +++ b/controls/menu.c @@ -12,6 +12,7 @@ * This is probably not the meaning this style has in MS-Windows. */ +#include "config.h" #include "wine/port.h" #include diff --git a/dlls/ddraw/mesa.c b/dlls/ddraw/mesa.c index c8be600be98..e18430d58bd 100644 --- a/dlls/ddraw/mesa.c +++ b/dlls/ddraw/mesa.c @@ -3,6 +3,8 @@ This file contains all MESA common code */ +#include "config.h" + #include "windef.h" #include "wine/obj_base.h" #include "ddraw.h" diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 7bf65829c20..f1550131a33 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -6,6 +6,7 @@ * */ +#include "config.h" #include "wine/port.h" #include diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c index 3eab1fdfdab..4823cd36a21 100644 --- a/dlls/kernel/comm.c +++ b/dlls/kernel/comm.c @@ -32,6 +32,7 @@ * */ +#include "config.h" #include "wine/port.h" #include diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 70ff5f5ba7b..3115597f773 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1,15 +1,15 @@ #ifndef __WINE_MSVCRT_H #define __WINE_MSVCRT_H -#include "config.h" +#include +#include +#include + #include "windef.h" #include "debugtools.h" #include "winbase.h" #include "winerror.h" #include "winnls.h" -#include -#include -#include /* TLS data */ extern DWORD MSVCRT_tls_index; diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 3610ed9686a..9154fd5fc06 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -1,11 +1,12 @@ /* * Helper functions for ntdll */ -#include -#include #include "config.h" +#include +#include + #include "debugtools.h" #include "ntdll_misc.h" diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 83a828760ce..93166d64e6e 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -9,6 +9,7 @@ * */ +#include "config.h" #include "wine/port.h" #include diff --git a/dlls/ttydrv/bitmap.c b/dlls/ttydrv/bitmap.c index e3ece649c31..9a09d5fb1ca 100644 --- a/dlls/ttydrv/bitmap.c +++ b/dlls/ttydrv/bitmap.c @@ -4,7 +4,10 @@ * Copyright 1999 Patrik Stridvall */ +#include "config.h" + #include + #include "bitmap.h" #include "gdi.h" #include "ttydrv.h" diff --git a/dlls/ttydrv/objects.c b/dlls/ttydrv/objects.c index 1c27ae6e10f..0165b54d4e6 100644 --- a/dlls/ttydrv/objects.c +++ b/dlls/ttydrv/objects.c @@ -4,6 +4,8 @@ * Copyright 1999 Patrik Stridvall */ +#include "config.h" + #include "bitmap.h" #include "gdi.h" #include "ttydrv.h" diff --git a/dlls/ttydrv/palette.c b/dlls/ttydrv/palette.c index 0ec90061d84..c727eb85627 100644 --- a/dlls/ttydrv/palette.c +++ b/dlls/ttydrv/palette.c @@ -4,6 +4,8 @@ * Copyright 1999 Patrik Stridvall */ +#include "config.h" + #include #include "color.h" diff --git a/dlls/ttydrv/ttydrv.h b/dlls/ttydrv/ttydrv.h index 6d0cae70b8f..7190142f5d5 100644 --- a/dlls/ttydrv/ttydrv.h +++ b/dlls/ttydrv/ttydrv.h @@ -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 diff --git a/dlls/ttydrv/user.c b/dlls/ttydrv/user.c index 0aeaf7b987b..38f2f76213f 100644 --- a/dlls/ttydrv/user.c +++ b/dlls/ttydrv/user.c @@ -4,6 +4,8 @@ * Copyright 1998 Patrik Stridvall */ +#include "config.h" + #include "dinput.h" #include "gdi.h" #include "ttydrv.h" diff --git a/dlls/winmm/wineoss/oss.h b/dlls/winmm/wineoss/oss.h index a8aab797847..f890fc8afc6 100644 --- a/dlls/winmm/wineoss/oss.h +++ b/dlls/winmm/wineoss/oss.h @@ -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 diff --git a/dlls/winsock/async.c b/dlls/winsock/async.c index 75dea387633..48b748ee8e0 100644 --- a/dlls/winsock/async.c +++ b/dlls/winsock/async.c @@ -19,6 +19,7 @@ * whole stuff did not work anyway to other changes). */ +#include "config.h" #include "wine/port.h" #include diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index 1c4730a0364..8547df09406 100644 --- a/dlls/winsock/socket.c +++ b/dlls/winsock/socket.c @@ -15,6 +15,7 @@ * ws_XXXXent32 (winsock2.h) and 1-byte forced ws_XXXXent16 (winsock16.h). */ +#include "config.h" #include "wine/port.h" #include diff --git a/dlls/x11drv/dga2.h b/dlls/x11drv/dga2.h index 5ee18440ef2..226234f15df 100644 --- a/dlls/x11drv/dga2.h +++ b/dlls/x11drv/dga2.h @@ -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" diff --git a/dlls/x11drv/x11ddraw.h b/dlls/x11drv/x11ddraw.h index 9faf11ddf88..0836f642be5 100644 --- a/dlls/x11drv/x11ddraw.h +++ b/dlls/x11drv/x11ddraw.h @@ -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; diff --git a/dlls/x11drv/xvidmode.h b/dlls/x11drv/xvidmode.h index 992cf3e4603..5bc8d516199 100644 --- a/dlls/x11drv/xvidmode.h +++ b/dlls/x11drv/xvidmode.h @@ -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" diff --git a/files/drive.c b/files/drive.c index 9a8882e6cfa..809e536f005 100644 --- a/files/drive.c +++ b/files/drive.c @@ -10,6 +10,7 @@ * */ +#include "config.h" #include "wine/port.h" #include diff --git a/include/cdrom.h b/include/cdrom.h index 8b6e3c9fb26..e7c42187689 100644 --- a/include/cdrom.h +++ b/include/cdrom.h @@ -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 #include -#include "config.h" #include "windef.h" #include "wine/windef16.h" diff --git a/include/config.h.in b/include/config.h.in index 93af9fa1029..bc7dd60b810 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -538,3 +538,6 @@ /* Define if struct sockaddr_un contains sun_len */ #undef HAVE_SOCKADDR_SUN_LEN +/* This must always be defined to allow checking for config.h inclusion */ +#undef __WINE_CONFIG_H + diff --git a/include/console.h b/include/console.h index 82c23e6fac5..85570d0f001 100644 --- a/include/console.h +++ b/include/console.h @@ -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 -#include "config.h" /* Can we compile with curses/ncurses? */ #if ( (defined(HAVE_LIBNCURSES) || defined(HAVE_LIBCURSES)) && \ diff --git a/include/gdi.h b/include/gdi.h index feff4adfbc6..bb0eec13323 100644 --- a/include/gdi.h +++ b/include/gdi.h @@ -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" diff --git a/include/heap.h b/include/heap.h index 112eecb21b1..b9fc6fcc643 100644 --- a/include/heap.h +++ b/include/heap.h @@ -7,9 +7,8 @@ #ifndef __WINE_HEAP_H #define __WINE_HEAP_H -#include "config.h" - #include + #include "winbase.h" #include "winnls.h" #include "wine/unicode.h" diff --git a/include/thread.h b/include/thread.h index d132ea91d4a..7a15948e9f0 100644 --- a/include/thread.h +++ b/include/thread.h @@ -7,8 +7,6 @@ #ifndef __WINE_THREAD_H #define __WINE_THREAD_H -#include "config.h" - #include "ntdef.h" /* UNICODE_STRING */ #include "wine/windef16.h" diff --git a/include/ts_shape.h b/include/ts_shape.h index 353599900a3..cff6c450f58 100644 --- a/include/ts_shape.h +++ b/include/ts_shape.h @@ -2,14 +2,15 @@ * Thread safe wrappers around shape calls. * Always include this file instead of . * This file was generated automatically by tools/make_X11wrappers - * - * Copyright 1998 Kristian Nielsen + * DO NOT EDIT! */ #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 diff --git a/include/ts_xf86dga.h b/include/ts_xf86dga.h index 289a3ce65e8..2b7f9f1947c 100644 --- a/include/ts_xf86dga.h +++ b/include/ts_xf86dga.h @@ -2,14 +2,15 @@ * Thread safe wrappers around xf86dga calls. * Always include this file instead of . * This file was generated automatically by tools/make_X11wrappers - * - * Copyright 1998 Kristian Nielsen + * DO NOT EDIT! */ #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 diff --git a/include/ts_xf86dga2.h b/include/ts_xf86dga2.h index f68760a6c05..950f75993ce 100644 --- a/include/ts_xf86dga2.h +++ b/include/ts_xf86dga2.h @@ -2,14 +2,15 @@ * Thread safe wrappers around xf86dga2 calls. * Always include this file instead of . * This file was generated automatically by tools/make_X11wrappers - * - * Copyright 1998 Kristian Nielsen + * DO NOT EDIT! */ #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 diff --git a/include/ts_xf86vmode.h b/include/ts_xf86vmode.h index 29ba711a6b3..3ac833b3665 100644 --- a/include/ts_xf86vmode.h +++ b/include/ts_xf86vmode.h @@ -2,14 +2,15 @@ * Thread safe wrappers around xf86vmode calls. * Always include this file instead of . * This file was generated automatically by tools/make_X11wrappers - * - * Copyright 1998 Kristian Nielsen + * DO NOT EDIT! */ #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 diff --git a/include/ts_xlib.h b/include/ts_xlib.h index 8a91b56351f..029eb47de7a 100644 --- a/include/ts_xlib.h +++ b/include/ts_xlib.h @@ -2,14 +2,15 @@ * Thread safe wrappers around Xlib calls. * Always include this file instead of . * This file was generated automatically by tools/make_X11wrappers - * - * Copyright 1998 Kristian Nielsen + * DO NOT EDIT! */ #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 diff --git a/include/ts_xpm.h b/include/ts_xpm.h index 12950eee739..e4e33966bae 100644 --- a/include/ts_xpm.h +++ b/include/ts_xpm.h @@ -2,14 +2,15 @@ * Thread safe wrappers around xpm calls. * Always include this file instead of . * This file was generated automatically by tools/make_X11wrappers - * - * Copyright 1998 Kristian Nielsen + * DO NOT EDIT! */ #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 diff --git a/include/ts_xrender.h b/include/ts_xrender.h index 17350e51244..9e9126b036e 100644 --- a/include/ts_xrender.h +++ b/include/ts_xrender.h @@ -2,14 +2,15 @@ * Thread safe wrappers around Xrender calls. * Always include this file instead of . * This file was generated automatically by tools/make_X11wrappers - * - * Copyright 1998 Kristian Nielsen + * DO NOT EDIT! */ #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 diff --git a/include/ts_xresource.h b/include/ts_xresource.h index 2202090c910..102716882a0 100644 --- a/include/ts_xresource.h +++ b/include/ts_xresource.h @@ -2,14 +2,15 @@ * Thread safe wrappers around Xresource calls. * Always include this file instead of . * This file was generated automatically by tools/make_X11wrappers - * - * Copyright 1998 Kristian Nielsen + * DO NOT EDIT! */ #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 diff --git a/include/ts_xshm.h b/include/ts_xshm.h index b54294fddc9..db4459c3a07 100644 --- a/include/ts_xshm.h +++ b/include/ts_xshm.h @@ -2,14 +2,15 @@ * Thread safe wrappers around XShm calls. * Always include this file instead of . * This file was generated automatically by tools/make_X11wrappers - * - * Copyright 1998 Kristian Nielsen + * DO NOT EDIT! */ #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 diff --git a/include/ts_xutil.h b/include/ts_xutil.h index 2389447381c..42744efeed8 100644 --- a/include/ts_xutil.h +++ b/include/ts_xutil.h @@ -2,14 +2,15 @@ * Thread safe wrappers around Xutil calls. * Always include this file instead of . * This file was generated automatically by tools/make_X11wrappers - * - * Copyright 1998 Kristian Nielsen + * DO NOT EDIT! */ #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 @@ -24,7 +25,6 @@ extern XSizeHints * TSXAllocSizeHints(void); extern XWMHints * TSXAllocWMHints(void); extern int TSXClipBox(Region, XRectangle*); extern Region TSXCreateRegion(void); -extern int TSXDeleteContext(Display*, XID, XContext); extern int TSXDestroyRegion(Region); extern int TSXEmptyRegion(Region); extern int TSXEqualRegion(Region, Region); @@ -54,6 +54,7 @@ extern int TSXDestroyImage(struct _XImage *); extern struct _XImage * TSXSubImage(struct _XImage *, int, int, unsigned int, unsigned int); extern int TSXAddPixel(struct _XImage *, long); extern XContext TSXUniqueContext(void); +extern int TSXDeleteContext(Display*,XID,XContext); #endif /* __WINE_TS_XUTIL_H */ diff --git a/include/ts_xvideo.h b/include/ts_xvideo.h index d92acdee054..e8b5968dcf2 100644 --- a/include/ts_xvideo.h +++ b/include/ts_xvideo.h @@ -2,14 +2,15 @@ * Thread safe wrappers around xvideo calls. * Always include this file instead of . * This file was generated automatically by tools/make_X11wrappers - * - * Copyright 1998 Kristian Nielsen + * DO NOT EDIT! */ #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 diff --git a/include/wine/port.h b/include/wine/port.h index 8f1635f3169..6d586028df5 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -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 #include diff --git a/include/wine_gl.h b/include/wine_gl.h index 2f3144f5452..368124ecc3b 100644 --- a/include/wine_gl.h +++ b/include/wine_gl.h @@ -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) diff --git a/include/x11drv.h b/include/x11drv.h index bd6a90c8b80..b145c367582 100644 --- a/include/x11drv.h +++ b/include/x11drv.h @@ -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 #include diff --git a/library/port.c b/library/port.c index ebf15d67d9a..aa0ddf06611 100644 --- a/library/port.c +++ b/library/port.c @@ -4,6 +4,7 @@ * Copyright 1996 Alexandre Julliard */ +#include "config.h" #include "wine/port.h" #ifdef __BEOS__ diff --git a/loader/elf.c b/loader/elf.c index c93d418cd12..378a7fed120 100644 --- a/loader/elf.c +++ b/loader/elf.c @@ -9,6 +9,7 @@ * IDEA(s): could be used to split up shell32,comctl32... */ +#include "config.h" #include "wine/port.h" #include diff --git a/loader/ne/module.c b/loader/ne/module.c index fc8b5b9fbbb..a2ed4a0ac35 100644 --- a/loader/ne/module.c +++ b/loader/ne/module.c @@ -4,6 +4,7 @@ * Copyright 1995 Alexandre Julliard */ +#include "config.h" #include "wine/port.h" #include diff --git a/loader/ne/resource.c b/loader/ne/resource.c index fdebb0d06b4..ac3bf82f601 100644 --- a/loader/ne/resource.c +++ b/loader/ne/resource.c @@ -6,6 +6,7 @@ * Copyright 1997 Alex Korobka */ +#include "config.h" #include "wine/port.h" #include diff --git a/memory/global.c b/memory/global.c index d2f54cbbc0a..23ebf29ac1e 100644 --- a/memory/global.c +++ b/memory/global.c @@ -5,6 +5,7 @@ */ /* 0xffff sometimes seems to mean: CURRENT_DS */ +#include "config.h" #include "wine/port.h" #include diff --git a/memory/virtual.c b/memory/virtual.c index bb31cbff498..22346746d1d 100644 --- a/memory/virtual.c +++ b/memory/virtual.c @@ -4,6 +4,7 @@ * Copyright 1997 Alexandre Julliard */ +#include "config.h" #include "wine/port.h" #include diff --git a/misc/cpu.c b/misc/cpu.c index ac1074e4a95..5b6fa1ff353 100644 --- a/misc/cpu.c +++ b/misc/cpu.c @@ -5,6 +5,7 @@ * Copyright 1997-1998 Marcus Meissner */ +#include "config.h" #include "wine/port.h" #include diff --git a/msdos/dosmem.c b/msdos/dosmem.c index 0bf62eec2bd..55e800855c1 100644 --- a/msdos/dosmem.c +++ b/msdos/dosmem.c @@ -5,6 +5,7 @@ * Copyright 1996 Marcus Meissner */ +#include "config.h" #include "wine/port.h" #include @@ -820,7 +821,7 @@ LPVOID DOSMEM_MapRealToLinear(DWORD x) LPVOID lin; lin=DOSMEM_dosmem+(x&0xffff)+(((x&0xffff0000)>>16)*16); - TRACE_(selector)("(0x%08lx) returns 0x%p.\n", x, lin ); + TRACE_(selector)("(0x%08lx) returns %p.\n", x, lin ); return lin; } diff --git a/msdos/dpmi.c b/msdos/dpmi.c index 11b9bff95be..e40d4ee77c1 100644 --- a/msdos/dpmi.c +++ b/msdos/dpmi.c @@ -4,6 +4,7 @@ * Copyright 1995 Alexandre Julliard */ +#include "config.h" #include "wine/port.h" #include diff --git a/msdos/int10.c b/msdos/int10.c index c55a105396c..ffa9755be3c 100644 --- a/msdos/int10.c +++ b/msdos/int10.c @@ -2,7 +2,10 @@ * BIOS interrupt 10h handler */ +#include "config.h" + #include + #include "miscemu.h" #include "vga.h" #include "debugtools.h" diff --git a/scheduler/client.c b/scheduler/client.c index f467948496b..a8cb4dd3e71 100644 --- a/scheduler/client.c +++ b/scheduler/client.c @@ -4,6 +4,7 @@ * Copyright (C) 1998 Alexandre Julliard */ +#include "config.h" #include "wine/port.h" #include diff --git a/scheduler/sysdeps.c b/scheduler/sysdeps.c index b931e779721..69da0949af1 100644 --- a/scheduler/sysdeps.c +++ b/scheduler/sysdeps.c @@ -4,6 +4,7 @@ * Copyright 1998 Alexandre Julliard */ +#include "config.h" #include "wine/port.h" #include diff --git a/scheduler/thread.c b/scheduler/thread.c index b3ce6f3649b..e3cf2cdaeef 100644 --- a/scheduler/thread.c +++ b/scheduler/thread.c @@ -4,6 +4,7 @@ * Copyright 1996 Alexandre Julliard */ +#include "config.h" #include "wine/port.h" #include diff --git a/server/request.c b/server/request.c index b7207a131f6..ba420a04ddf 100644 --- a/server/request.c +++ b/server/request.c @@ -4,6 +4,7 @@ * Copyright (C) 1998 Alexandre Julliard */ +#include "config.h" #include "wine/port.h" #include diff --git a/tools/make_X11wrappers b/tools/make_X11wrappers index edf86e54922..b1a1ae02bd7 100755 --- a/tools/make_X11wrappers +++ b/tools/make_X11wrappers @@ -106,14 +106,15 @@ foreach $name (@dolist) { * Thread safe wrappers around $name calls. * Always include this file instead of . * This file was generated automatically by tools/make_X11wrappers - * - * Copyright 1998 Kristian Nielsen + * DO NOT EDIT! */ #ifndef __WINE_TS_$ucname\_H #define __WINE_TS_$ucname\_H -#include "config.h" +#ifndef __WINE_CONFIG_H +# error You must include config.h to use this header +#endif $pre_file $x11_incl#include diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index a74fe7f4730..1ef1a914b87 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -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 #include diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index 12807fb11a9..39e50d5d82f 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -8,6 +8,7 @@ * Copyright 1999 Ulrich Weigand */ +#include "config.h" #include "wine/port.h" #include diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 93944e7b528..95c399d6e27 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -1,5 +1,7 @@ /* small utility functions for winebuild */ +#include "config.h" + #include #include #include diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index ec8b3abc293..75fb7541c4f 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -79,8 +79,6 @@ cident [a-zA-Z_][0-9a-zA-Z_]* /*#define LEX_DEBUG*/ -#include "config.h" - #include #include #include diff --git a/tools/wrc/ppl.l b/tools/wrc/ppl.l index 4b2500826b4..412d100c21d 100644 --- a/tools/wrc/ppl.l +++ b/tools/wrc/ppl.l @@ -138,8 +138,6 @@ cident [a-zA-Z_][0-9a-zA-Z_]* ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL] %{ -#include "config.h" - #include #include #include diff --git a/win32/device.c b/win32/device.c index d95d279c0de..1e850185e4f 100644 --- a/win32/device.c +++ b/win32/device.c @@ -7,6 +7,7 @@ * */ +#include "config.h" #include "wine/port.h" #include diff --git a/windows/class.c b/windows/class.c index e0bacb0fd67..80c03dbf023 100644 --- a/windows/class.c +++ b/windows/class.c @@ -12,6 +12,7 @@ * classes are getting registered with wrong hInstance. */ +#include "config.h" #include "wine/port.h" #include diff --git a/windows/dialog.c b/windows/dialog.c index 576a75ead0f..45ff1f578a9 100644 --- a/windows/dialog.c +++ b/windows/dialog.c @@ -4,6 +4,7 @@ * Copyright 1993, 1994, 1996 Alexandre Julliard */ +#include "config.h" #include "wine/port.h" #include diff --git a/windows/x11drv/clipboard.c b/windows/x11drv/clipboard.c index 8cf99942b15..4dcd92cce98 100644 --- a/windows/x11drv/clipboard.c +++ b/windows/x11drv/clipboard.c @@ -45,7 +45,7 @@ * */ -#include "ts_xlib.h" +#include "config.h" #include #include @@ -53,6 +53,7 @@ #include #include +#include "ts_xlib.h" #include "winreg.h" #include "clipboard.h" #include "win.h"