config.h fixes for Solaris

François Gouget fgouget at codeweavers.com
Sat Oct 13 14:04:08 CDT 2001 

   On Solaris we keep getting warnings like:

../../include/config.h:483: warning: `_FILE_OFFSET_BITS' redefined 
/usr/include/sys/feature_tests.h:96: warning: this is the location of
the previous definition 

   The problem is that config.h defines macros that impact the behavior
of the system headers. But config.h is sometimes included after these
system headers, which is very wrong. If included, config.h should always
be the very first included header.


   This patch fixes the cases where config.h is included directly.
Unfortunately this is not a complete fix because most of the time
config.h is included indirectly via another header like wine/port.h,
gdi.h, ... or debugtools.h (argh).
   Well, it's a start anyway.


Changelog:

   François Gouget <fgouget at codeweavers.com>

 * console/generic.c,
   console/interface.c,
   console/ncurses.c,
   console/tty.c,
   dlls/ddraw/d3dexecutebuffer.c,
   dlls/ddraw/d3dtexture.c,
   dlls/ddraw/d3ddevice/main.c,
   dlls/ddraw/d3ddevice/mesa.c,
   dlls/ntdll/exception.c,
   dlls/opengl32/wgl.c,
   dlls/shell32/systray.c,
   dlls/user/exticon.c,
   dlls/wineps/graphics.c,
   graphics/env.c,
   graphics/path.c,
   loader/loadorder.c,
   loader/pe_resource.c,
   memory/heap.c,
   memory/selector.c,
   msdos/int11.c,
   msdos/int16.c,
   relay32/relay386.c,
   scheduler/critsection.c,
   server/mapping.c,
   server/trace.c,
   tools/winebuild/import.c,
   tools/winebuild/main.c,
   tools/winebuild/parser.c,
   tools/winebuild/relay.c,
   tools/winebuild/spec32.c,
   tools/wmc/mcl.c,
   tools/wmc/mcy.y,
   tools/wmc/wmc.c,
   windows/winproc.c,
   windows/x11drv/wineclipsrv.c

   When including config.h, include it first.

   
-- 
François Gouget
fgouget at codeweavers.com
-------------- next part --------------
Index: console/generic.c
===================================================================
RCS file: /home/wine/wine/console/generic.c,v
retrieving revision 1.12
diff -u -r1.12 generic.c
--- console/generic.c	2000/12/27 04:02:46	1.12
+++ console/generic.c	2001/10/13 17:09:38
@@ -10,10 +10,11 @@
    that driver supports into the driver struct. If it is a supplementary
    driver, it should make sure to preserve the old values. */
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "console.h"
-#include "config.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(console);
Index: console/interface.c
===================================================================
RCS file: /home/wine/wine/console/interface.c,v
retrieving revision 1.13
diff -u -r1.13 interface.c
--- console/interface.c	2000/10/19 20:31:09	1.13
+++ console/interface.c	2001/10/13 17:09:38
@@ -6,11 +6,12 @@
    This could be done using a macro, but additional functionality
    may be provided here in the future. */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
 #include "windef.h"
 #include "console.h"
 #include "options.h"
Index: console/ncurses.c
===================================================================
RCS file: /home/wine/wine/console/ncurses.c,v
retrieving revision 1.16
diff -u -r1.16 ncurses.c
--- console/ncurses.c	2000/11/27 23:54:25	1.16
+++ console/ncurses.c	2001/10/13 17:09:38
@@ -1,8 +1,10 @@
 /* ncurses.c */
 /* Copyright 1999 - Joseph Pranevich */
 
-#include <stdio.h>
 #include "config.h"
+
+#include <stdio.h>
+
 #include "console.h"	/* Must define WINE_NCURSES */
 
 #ifdef WINE_NCURSES
Index: console/tty.c
===================================================================
RCS file: /home/wine/wine/console/tty.c,v
retrieving revision 1.6
diff -u -r1.6 tty.c
--- console/tty.c	1999/03/14 16:35:05	1.6
+++ console/tty.c	2001/10/13 17:09:38
@@ -10,9 +10,11 @@
    that driver supports into the driver struct. If it is a supplementary
    driver, it should make sure to perserve the old values. */
 
+#include "config.h"
+
 #include <stdio.h>
+
 #include "console.h"
-#include "config.h"
 #include "windef.h"
 void TTY_Start()
 {
Index: dlls/ddraw/d3dexecutebuffer.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/d3dexecutebuffer.c,v
retrieving revision 1.5
diff -u -r1.5 d3dexecutebuffer.c
--- dlls/ddraw/d3dexecutebuffer.c	2001/07/25 00:43:30	1.5
+++ dlls/ddraw/d3dexecutebuffer.c	2001/10/13 17:09:47
@@ -4,8 +4,10 @@
    This files contains the implementation of Direct3DExecuteBuffer. */
 
 
-#include <string.h>
 #include "config.h"
+
+#include <string.h>
+
 #include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
Index: dlls/ddraw/d3dtexture.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/d3dtexture.c,v
retrieving revision 1.10
diff -u -r1.10 d3dtexture.c
--- dlls/ddraw/d3dtexture.c	2001/07/25 00:43:30	1.10
+++ dlls/ddraw/d3dtexture.c	2001/10/13 17:09:48
@@ -4,8 +4,10 @@
    This files contains the implementation of interface Direct3DTexture2. */
 
 
-#include <string.h>
 #include "config.h"
+
+#include <string.h>
+
 #include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
Index: dlls/ddraw/d3ddevice/main.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/d3ddevice/main.c,v
retrieving revision 1.7
diff -u -r1.7 main.c
--- dlls/ddraw/d3ddevice/main.c	2001/07/25 00:43:30	1.7
+++ dlls/ddraw/d3ddevice/main.c	2001/10/13 17:09:48
@@ -4,8 +4,10 @@
    This files contains all the common stuff for D3D devices.
  */
 
-#include <string.h>
 #include "config.h"
+
+#include <string.h>
+
 #include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
Index: dlls/ddraw/d3ddevice/mesa.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/d3ddevice/mesa.c,v
retrieving revision 1.14
diff -u -r1.14 mesa.c
--- dlls/ddraw/d3ddevice/mesa.c	2001/07/25 00:43:30	1.14
+++ dlls/ddraw/d3ddevice/mesa.c	2001/10/13 17:09:49
@@ -4,8 +4,10 @@
    This files contains the MESA implementation of all the D3D devices that
    Wine supports. */
 
-#include <string.h>
 #include "config.h"
+
+#include <string.h>
+
 #include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
Index: dlls/ntdll/exception.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/exception.c,v
retrieving revision 1.38
diff -u -r1.38 exception.c
--- dlls/ntdll/exception.c	2001/09/11 00:32:32	1.38
+++ dlls/ntdll/exception.c	2001/10/13 17:09:54
@@ -5,10 +5,11 @@
  * Copyright 1999 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <signal.h>
 
-#include "config.h"
 #include "winnt.h"
 #include "ntddk.h"
 #include "global.h"
Index: dlls/opengl32/wgl.c
===================================================================
RCS file: /home/wine/wine/dlls/opengl32/wgl.c,v
retrieving revision 1.17
diff -u -r1.17 wgl.c
--- dlls/opengl32/wgl.c	2001/06/26 21:10:11	1.17
+++ dlls/opengl32/wgl.c	2001/10/13 17:09:55
@@ -3,12 +3,13 @@
      Copyright (c) 1999 Lionel Ulmer
 */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 
 #include "wine/exception.h"
 
-#include "config.h"
 #include "debugtools.h"
 #include "gdi.h"
 #include "windef.h"
Index: dlls/shell32/systray.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/systray.c,v
retrieving revision 1.14
diff -u -r1.14 systray.c
--- dlls/shell32/systray.c	2001/08/21 17:07:17	1.14
+++ dlls/shell32/systray.c	2001/10/13 17:09:57
@@ -9,6 +9,8 @@
  *
  */
 
+#include "config.h"
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
@@ -19,7 +21,6 @@
 #include "shell32_main.h"
 #include "commctrl.h"
 #include "debugtools.h"
-#include "config.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
 
Index: dlls/user/exticon.c
===================================================================
RCS file: /home/wine/wine/dlls/user/exticon.c,v
retrieving revision 1.13
diff -u -r1.13 exticon.c
--- dlls/user/exticon.c	2001/02/28 05:31:03	1.13
+++ dlls/user/exticon.c	2001/10/13 17:09:58
@@ -5,11 +5,14 @@
  * this should replace the icon extraction code in shell32 and shell16 once
  * it needs a serious test for compliance with the native API 
  */
+
+#include "config.h"
+
 #include <string.h>
 #include <stdlib.h>	/* abs() */
 #include <sys/types.h>
 #include <unistd.h>
-#include "config.h"
+
 #include "winbase.h"
 #include "windef.h"
 #include "winerror.h"
Index: dlls/wineps/graphics.c
===================================================================
RCS file: /home/wine/wine/dlls/wineps/graphics.c,v
retrieving revision 1.4
diff -u -r1.4 graphics.c
--- dlls/wineps/graphics.c	2001/01/24 19:38:56	1.4
+++ dlls/wineps/graphics.c	2001/10/13 17:09:58
@@ -4,9 +4,11 @@
  *	Copyright 1998  Huw D M Davies
  *
  */
+
+#include "config.h"
+
 #include <string.h>
 #include <math.h>
-#include "config.h"
 #if defined(HAVE_FLOAT_H)
  #include <float.h>
 #endif
Index: graphics/env.c
===================================================================
RCS file: /home/wine/wine/graphics/env.c,v
retrieving revision 1.9
diff -u -r1.9 env.c
--- graphics/env.c	2001/07/24 21:45:23	1.9
+++ graphics/env.c	2001/10/13 17:10:04
@@ -6,9 +6,12 @@
  * Copyright 1997 Marcus Meissner
  * Copyright 1998 Andreas Mohr
  */
+
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
+
 #include "gdi.h"
 #include "debugtools.h"
 
Index: graphics/path.c
===================================================================
RCS file: /home/wine/wine/graphics/path.c,v
retrieving revision 1.23
diff -u -r1.23 path.c
--- graphics/path.c	2001/09/14 21:28:36	1.23
+++ graphics/path.c	2001/10/13 17:10:05
@@ -5,10 +5,11 @@
  *                 1999 Huw D M Davies
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <math.h>
 #include <string.h>
-#include "config.h"
 #if defined(HAVE_FLOAT_H)
 #include <float.h>
 #endif
Index: loader/loadorder.c
===================================================================
RCS file: /home/wine/wine/loader/loadorder.c,v
retrieving revision 1.46
diff -u -r1.46 loadorder.c
--- loader/loadorder.c	2001/08/10 22:29:22	1.46
+++ loader/loadorder.c	2001/10/13 17:10:09
@@ -4,11 +4,12 @@
  * Copyright 1999 Bertho Stultiens
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
-#include "config.h"
 #include "windef.h"
 #include "winreg.h"
 #include "winerror.h"
Index: loader/pe_resource.c
===================================================================
RCS file: /home/wine/wine/loader/pe_resource.c,v
retrieving revision 1.33
diff -u -r1.33 pe_resource.c
--- loader/pe_resource.c	2001/06/13 20:13:19	1.33
+++ loader/pe_resource.c	2001/10/13 17:10:10
@@ -10,10 +10,10 @@
  * Copyright 1997 Marcus Meissner
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <sys/types.h>
-
-#include "config.h"
 
 #include "wine/unicode.h"
 #include "windef.h"
Index: memory/heap.c
===================================================================
RCS file: /home/wine/wine/memory/heap.c,v
retrieving revision 1.51
diff -u -r1.51 heap.c
--- memory/heap.c	2001/09/26 23:11:21	1.51
+++ memory/heap.c	2001/10/13 17:10:14
@@ -5,11 +5,13 @@
  * Copyright 1998 Ulrich Weigand
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
+
 #include "wine/winbase16.h"
 #include "wine/unicode.h"
 #include "selectors.h"
Index: memory/selector.c
===================================================================
RCS file: /home/wine/wine/memory/selector.c,v
retrieving revision 1.39
diff -u -r1.39 selector.c
--- memory/selector.c	2001/07/19 00:39:10	1.39
+++ memory/selector.c	2001/10/13 17:10:14
@@ -4,9 +4,10 @@
  * Copyright 1995 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <string.h>
 
-#include "config.h"
 #include "winerror.h"
 #include "wine/winbase16.h"
 #include "miscemu.h"
Index: msdos/int11.c
===================================================================
RCS file: /home/wine/wine/msdos/int11.c,v
retrieving revision 1.11
diff -u -r1.11 int11.c
--- msdos/int11.c	2001/06/20 23:03:18	1.11
+++ msdos/int11.c	2001/10/13 17:10:17
@@ -2,11 +2,12 @@
  * BIOS interrupt 11h handler
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
 #include "windef.h"
 #include "miscemu.h"
 #include "msdos.h"
Index: msdos/int16.c
===================================================================
RCS file: /home/wine/wine/msdos/int16.c,v
retrieving revision 1.15
diff -u -r1.15 int16.c
--- msdos/int16.c	2000/12/26 00:22:46	1.15
+++ msdos/int16.c	2001/10/13 17:10:17
@@ -2,11 +2,12 @@
  * DOS interrupt 16h handler
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "module.h"
 #include "callback.h"
 #include "dosexe.h"
Index: relay32/relay386.c
===================================================================
RCS file: /home/wine/wine/relay32/relay386.c,v
retrieving revision 1.35
diff -u -r1.35 relay386.c
--- relay32/relay386.c	2001/05/08 00:13:39	1.35
+++ relay32/relay386.c	2001/10/13 17:10:19
@@ -5,11 +5,12 @@
  */
 
 
+#include "config.h"
+
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
 
-#include "config.h"
 #include "winnt.h"
 #include "stackframe.h"
 #include "module.h"
Index: scheduler/critsection.c
===================================================================
RCS file: /home/wine/wine/scheduler/critsection.c,v
retrieving revision 1.31
diff -u -r1.31 critsection.c
--- scheduler/critsection.c	2001/08/17 00:08:20	1.31
+++ scheduler/critsection.c	2001/10/13 17:10:19
@@ -4,12 +4,13 @@
  * Copyright 1998 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "config.h"
 #include "winerror.h"
 #include "winbase.h"
 #include "ntddk.h"
Index: server/mapping.c
===================================================================
RCS file: /home/wine/wine/server/mapping.c,v
retrieving revision 1.24
diff -u -r1.24 mapping.c
--- server/mapping.c	2001/10/04 16:18:15	1.24
+++ server/mapping.c	2001/10/13 17:10:20
@@ -4,12 +4,13 @@
  * Copyright (C) 1999 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "winnt.h"
 #include "winbase.h"
 
Index: server/trace.c
===================================================================
RCS file: /home/wine/wine/server/trace.c,v
retrieving revision 1.108
diff -u -r1.108 trace.c
--- server/trace.c	2001/10/12 19:10:26	1.108
+++ server/trace.c	2001/10/13 17:10:21
@@ -4,12 +4,13 @@
  * Copyright (C) 1999 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 
-#include "config.h"
 #include "winsock2.h"
 #include "winnt.h"
 #include "winbase.h"
Index: tools/winebuild/import.c
===================================================================
RCS file: /home/wine/wine/tools/winebuild/import.c,v
retrieving revision 1.18
diff -u -r1.18 import.c
--- tools/winebuild/import.c	2001/05/22 19:55:51	1.18
+++ tools/winebuild/import.c	2001/10/13 17:10:22
@@ -5,12 +5,13 @@
  *           2000 Eric Pouech
  */
 
+#include "config.h"
+
 #include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 
-#include "config.h"
 #include "winnt.h"
 #include "build.h"
 
Index: tools/winebuild/main.c
===================================================================
RCS file: /home/wine/wine/tools/winebuild/main.c,v
retrieving revision 1.18
diff -u -r1.18 main.c
--- tools/winebuild/main.c	2001/06/07 22:29:03	1.18
+++ tools/winebuild/main.c	2001/10/13 17:10:22
@@ -8,13 +8,14 @@
  * Copyright 1999 Ulrich Weigand
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
 
-#include "config.h"
 #include "winnt.h"
 #include "build.h"
 
Index: tools/winebuild/parser.c
===================================================================
RCS file: /home/wine/wine/tools/winebuild/parser.c,v
retrieving revision 1.19
diff -u -r1.19 parser.c
--- tools/winebuild/parser.c	2001/06/07 22:29:03	1.19
+++ tools/winebuild/parser.c	2001/10/13 17:10:22
@@ -8,6 +8,8 @@
  * Copyright 1999 Ulrich Weigand
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -15,7 +17,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "winbase.h"
 #include "build.h"
 
Index: tools/winebuild/relay.c
===================================================================
RCS file: /home/wine/wine/tools/winebuild/relay.c,v
retrieving revision 1.12
diff -u -r1.12 relay.c
--- tools/winebuild/relay.c	2001/08/28 17:26:49	1.12
+++ tools/winebuild/relay.c	2001/10/13 17:10:23
@@ -8,10 +8,11 @@
  * Copyright 1999 Ulrich Weigand
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "winnt.h"
 #include "thread.h"
 #include "stackframe.h"
Index: tools/winebuild/spec32.c
===================================================================
RCS file: /home/wine/wine/tools/winebuild/spec32.c,v
retrieving revision 1.30
diff -u -r1.30 spec32.c
--- tools/winebuild/spec32.c	2001/10/02 20:32:58	1.30
+++ tools/winebuild/spec32.c	2001/10/13 17:10:24
@@ -8,12 +8,13 @@
  * Copyright 1999 Ulrich Weigand
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <ctype.h>
 #include <unistd.h>
 #include <string.h>
 
-#include "config.h"
 #include "winbase.h"
 #include "wine/exception.h"
 #include "build.h"
Index: tools/wmc/mcl.c
===================================================================
RCS file: /home/wine/wine/tools/wmc/mcl.c,v
retrieving revision 1.2
diff -u -r1.2 mcl.c
--- tools/wmc/mcl.c	2001/03/21 20:30:47	1.2
+++ tools/wmc/mcl.c	2001/10/13 17:10:24
@@ -4,13 +4,14 @@
  * Copyright 2000 Bertho A. Stultiens (BS)
  *
  */
+
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <assert.h>
 #include <string.h>
-
-#include "config.h"
 
 #include "utils.h"
 #include "wmc.h"
Index: tools/wmc/mcy.y
===================================================================
RCS file: /home/wine/wine/tools/wmc/mcy.y,v
retrieving revision 1.2
diff -u -r1.2 mcy.y
--- tools/wmc/mcy.y	2000/07/28 22:21:38	1.2
+++ tools/wmc/mcy.y	2001/10/13 17:10:25
@@ -22,11 +22,11 @@
 
 %{
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-
-#include "config.h"
 
 #include "utils.h"
 #include "wmc.h"
Index: tools/wmc/wmc.c
===================================================================
RCS file: /home/wine/wine/tools/wmc/wmc.c,v
retrieving revision 1.1
diff -u -r1.1 wmc.c
--- tools/wmc/wmc.c	2000/06/13 04:34:42	1.1
+++ tools/wmc/wmc.c	2001/10/13 17:10:25
@@ -4,12 +4,13 @@
  * Copyright 2000 Bertho A. Stultiens (BS)
  *
  */
+
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
-
-#include "config.h"
 
 #include "wmc.h"
 #include "utils.h"
Index: windows/winproc.c
===================================================================
RCS file: /home/wine/wine/windows/winproc.c,v
retrieving revision 1.74
diff -u -r1.74 winproc.c
--- windows/winproc.c	2001/09/19 20:37:05	1.74
+++ windows/winproc.c	2001/10/13 17:10:30
@@ -5,9 +5,10 @@
  * Copyright 1996 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <string.h>
 
-#include "config.h"
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
Index: windows/x11drv/wineclipsrv.c
===================================================================
RCS file: /home/wine/wine/windows/x11drv/wineclipsrv.c,v
retrieving revision 1.6
diff -u -r1.6 wineclipsrv.c
--- windows/x11drv/wineclipsrv.c	2001/10/08 20:28:36	1.6
+++ windows/x11drv/wineclipsrv.c	2001/10/13 17:10:30
@@ -44,14 +44,14 @@
  * TODO:
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xos.h>
 #include <X11/Xatom.h>
-
-#include "config.h"
 
 /*
  *  Lightweight debug definitions for Wine Clipboard Server.

More information about the wine-patches mailing list