Fix the #include order for config.h.

configure

@@ -6925,6 +6925,11 @@ fi
 
 
 
+cat >> confdefs.h <<\EOF
+#define __WINE_CONFIG_H 1
+EOF
+
+
 
 
 MAKE_RULES=Make.rules

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 \

console/xterm.c

@@ -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>

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 <assert.h>

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"

dlls/dplayx/dplay.c

@@ -6,6 +6,7 @@
  *
  */
 
+#include "config.h"
 #include "wine/port.h"
 
 #include <string.h>

dlls/kernel/comm.c

@@ -32,6 +32,7 @@
  * 
  */
 
+#include "config.h"
 #include "wine/port.h"
 
 #include <stdlib.h>

dlls/msvcrt/msvcrt.h

 #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;

dlls/ntdll/misc.c

 /*
  * 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"
 

dlls/odbc32/proxyodbc.c

@@ -9,6 +9,7 @@
  *
  */
 
+#include "config.h"
 #include "wine/port.h"
 
 #include <stdio.h>

dlls/ttydrv/bitmap.c

@@ -4,7 +4,10 @@
  * Copyright 1999 Patrik Stridvall
  */
 
+#include "config.h"
+
 #include <string.h>
+
 #include "bitmap.h"
 #include "gdi.h"
 #include "ttydrv.h"

dlls/ttydrv/objects.c

@@ -4,6 +4,8 @@
  * Copyright 1999 Patrik Stridvall
  */
 
+#include "config.h"
+
 #include "bitmap.h"
 #include "gdi.h"
 #include "ttydrv.h"

dlls/ttydrv/palette.c

@@ -4,6 +4,8 @@
  * Copyright 1999 Patrik Stridvall
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 
 #include "color.h"

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

dlls/ttydrv/user.c

@@ -4,6 +4,8 @@
  * Copyright 1998 Patrik Stridvall
  */
 
+#include "config.h"
+
 #include "dinput.h"
 #include "gdi.h"
 #include "ttydrv.h"

dlls/winmm/wineoss/oss.h

 /* 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>

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 <string.h>

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 <stdio.h>

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"
 

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;

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"
 

files/drive.c

@@ -10,6 +10,7 @@
  *
  */
 
+#include "config.h"
 #include "wine/port.h"
 
 #include <assert.h>

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 <stdlib.h>
 #include <unistd.h>
-#include "config.h"
 #include "windef.h"
 #include "wine/windef16.h"
 

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
+

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 <stdio.h>
-#include "config.h"
 
 /* Can we compile with curses/ncurses? */
 #if (	(defined(HAVE_LIBNCURSES) || defined(HAVE_LIBCURSES)) &&	\

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"

include/heap.h

@@ -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"

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"
 

include/ts_shape.h

@@ -2,14 +2,15 @@
  * Thread safe wrappers around shape calls.
  * Always include this file instead of <X11/shape.h>.
  * 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 <X11/IntrinsicP.h>

include/ts_xf86dga.h

@@ -2,14 +2,15 @@
  * Thread safe wrappers around xf86dga calls.
  * Always include this file instead of <X11/xf86dga.h>.
  * 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
 

include/ts_xf86dga2.h

@@ -2,14 +2,15 @@
  * Thread safe wrappers around xf86dga2 calls.
  * Always include this file instead of <X11/xf86dga2.h>.
  * 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
 

include/ts_xf86vmode.h

@@ -2,14 +2,15 @@
  * Thread safe wrappers around xf86vmode calls.
  * Always include this file instead of <X11/xf86vmode.h>.
  * 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

include/ts_xlib.h

@@ -2,14 +2,15 @@
  * Thread safe wrappers around Xlib calls.
  * Always include this file instead of <X11/Xlib.h>.
  * 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 <X11/Xlib.h>

include/ts_xpm.h

@@ -2,14 +2,15 @@
  * Thread safe wrappers around xpm calls.
  * Always include this file instead of <X11/xpm.h>.
  * 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
 

include/ts_xrender.h

@@ -2,14 +2,15 @@
  * Thread safe wrappers around Xrender calls.
  * Always include this file instead of <X11/Xrender.h>.
  * 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
 

include/ts_xresource.h

@@ -2,14 +2,15 @@
  * Thread safe wrappers around Xresource calls.
  * Always include this file instead of <X11/Xresource.h>.
  * 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 <X11/Xlib.h>

include/ts_xshm.h

@@ -2,14 +2,15 @@
  * Thread safe wrappers around XShm calls.
  * Always include this file instead of <X11/XShm.h>.
  * 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
 

include/ts_xutil.h

@@ -2,14 +2,15 @@
  * Thread safe wrappers around Xutil calls.
  * Always include this file instead of <X11/Xutil.h>.
  * 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 <X11/Xlib.h>
@@ -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 */

include/ts_xvideo.h

@@ -2,14 +2,15 @@
  * Thread safe wrappers around xvideo calls.
  * Always include this file instead of <X11/xvideo.h>.
  * 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
 

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 <fcntl.h>
 #include <sys/types.h>

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)
 

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 <X11/Xlib.h>
 #include <X11/Xresource.h>

library/port.c

@@ -4,6 +4,7 @@
  * Copyright 1996 Alexandre Julliard
  */
 
+#include "config.h"
 #include "wine/port.h"
 
 #ifdef __BEOS__

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 <assert.h>

loader/ne/module.c

@@ -4,6 +4,7 @@
  * Copyright 1995 Alexandre Julliard
  */
 
+#include "config.h"
 #include "wine/port.h" 
 
 #include <assert.h>

loader/ne/resource.c

@@ -6,6 +6,7 @@
  * Copyright 1997 Alex Korobka
  */
 
+#include "config.h"
 #include "wine/port.h" 
 
 #include <stdio.h>

memory/global.c

@@ -5,6 +5,7 @@
  */
 /* 0xffff sometimes seems to mean: CURRENT_DS */
 
+#include "config.h"
 #include "wine/port.h"
 
 #include <sys/types.h>

memory/virtual.c

@@ -4,6 +4,7 @@
  * Copyright 1997 Alexandre Julliard
  */
 
+#include "config.h"
 #include "wine/port.h"
 
 #include <assert.h>

misc/cpu.c

@@ -5,6 +5,7 @@
  * Copyright 1997-1998 Marcus Meissner
  */
 
+#include "config.h"
 #include "wine/port.h"
 
 #include <ctype.h>

msdos/dosmem.c

@@ -5,6 +5,7 @@
  * Copyright 1996 Marcus Meissner
  */
 
+#include "config.h"
 #include "wine/port.h"
 
 #include <signal.h>
@@ -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;
 }
 

msdos/dpmi.c

@@ -4,6 +4,7 @@
  * Copyright 1995 Alexandre Julliard
  */
 
+#include "config.h"
 #include "wine/port.h"
 
 #include <unistd.h>

msdos/int10.c

@@ -2,7 +2,10 @@
  * BIOS interrupt 10h handler
  */
 
+#include "config.h"
+
 #include <stdlib.h>
+
 #include "miscemu.h"
 #include "vga.h"
 #include "debugtools.h"

scheduler/client.c

@@ -4,6 +4,7 @@
  * Copyright (C) 1998 Alexandre Julliard
  */
 
+#include "config.h"
 #include "wine/port.h"
 
 #include <assert.h>

scheduler/sysdeps.c

@@ -4,6 +4,7 @@
  * Copyright 1998 Alexandre Julliard
  */
 
+#include "config.h"
 #include "wine/port.h"
 
 #include <signal.h>

scheduler/thread.c

@@ -4,6 +4,7 @@
  * Copyright 1996 Alexandre Julliard
  */
 
+#include "config.h"
 #include "wine/port.h"
 
 #include <assert.h>

server/request.c

@@ -4,6 +4,7 @@
  * Copyright (C) 1998 Alexandre Julliard
  */
 
+#include "config.h"
 #include "wine/port.h"
 
 #include <assert.h>

tools/make_X11wrappers

@@ -106,14 +106,15 @@ foreach $name (@dolist) {
  * Thread safe wrappers around $name calls.
  * Always include this file instead of <X11/$name.h>.
  * 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 <X11/$extensions_dir$inc_name.h>

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 <stdio.h>
 #include <stdlib.h>
 

tools/winebuild/spec16.c

@@ -8,6 +8,7 @@
  * Copyright 1999 Ulrich Weigand
  */
 
+#include "config.h"
 #include "wine/port.h"
 
 #include <assert.h>

tools/winebuild/utils.c

 /* small utility functions for winebuild */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>

tools/wrc/parser.l

@@ -79,8 +79,6 @@ cident	[a-zA-Z_][0-9a-zA-Z_]*
 
 /*#define LEX_DEBUG*/
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>

win32/device.c

@@ -7,6 +7,7 @@
  *
  */
 
+#include "config.h"
 #include "wine/port.h"
 
 #include <stdlib.h>

windows/class.c

@@ -12,6 +12,7 @@
  *   classes are getting registered with wrong hInstance.
  */
 
+#include "config.h"
 #include "wine/port.h"
 
 #include <stdlib.h>

windows/dialog.c

@@ -4,6 +4,7 @@
  * Copyright 1993, 1994, 1996 Alexandre Julliard
  */
 
+#include "config.h"
 #include "wine/port.h" 
 
 #include <ctype.h>

windows/x11drv/clipboard.c

@@ -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"