From 021bd85834a185225a991f1bf4c8ac5897cef6fb Mon Sep 17 00:00:00 2001
From: Patrik Stridvall <ps@leissner.se>
Date: Sun, 18 Jul 1999 18:40:11 +0000
Subject: [PATCH] Make it possible to compile with GNU C's -I- option.

---
 debugger/display.c        | 3 ++-
 dlls/winaspi/winaspi16.c  | 5 +++--
 dlls/wnaspi32/winaspi32.c | 4 ++--
 tools/wrc/dumpres.c       | 3 ++-
 tools/wrc/genres.c        | 3 ++-
 tools/wrc/newstruc.c      | 3 ++-
 tools/wrc/parser.l        | 3 ++-
 tools/wrc/preproc.c       | 3 ++-
 tools/wrc/readres.c       | 3 ++-
 tools/wrc/utils.c         | 3 ++-
 tools/wrc/wrc.c           | 6 ++++--
 tools/wrc/writeres.c      | 3 ++-
 12 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/debugger/display.c b/debugger/display.c
index 74a75196d42..df9f9fc5c35 100644
--- a/debugger/display.c
+++ b/debugger/display.c
@@ -10,7 +10,8 @@
 #include <string.h>
 #include <limits.h>
 #include <sys/types.h>
-#include <neexe.h>
+
+#include "neexe.h"
 #include "module.h"
 #include "selectors.h"
 #include "debugger.h"
diff --git a/dlls/winaspi/winaspi16.c b/dlls/winaspi/winaspi16.c
index 0553a93f9f6..2249c521fc4 100644
--- a/dlls/winaspi/winaspi16.c
+++ b/dlls/winaspi/winaspi16.c
@@ -3,11 +3,10 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <ldt.h>
 #include <memory.h>
 #include <unistd.h>
-#include <callback.h>
 #include <string.h>
+
 #include "winbase.h"
 #include "aspi.h"
 #include "winaspi.h"
@@ -16,6 +15,8 @@
 #include "debugtools.h"
 #include "selectors.h"
 #include "miscemu.h"
+#include "ldt.h"
+#include "callback.h"
 
 DEFAULT_DEBUG_CHANNEL(aspi)
 
diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c
index a62c4432613..9e3a5216bb4 100644
--- a/dlls/wnaspi32/winaspi32.c
+++ b/dlls/wnaspi32/winaspi32.c
@@ -3,10 +3,8 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <ldt.h>
 #include <memory.h>
 #include <unistd.h>
-#include <callback.h>
 
 #include "winbase.h"
 #include "aspi.h"
@@ -14,6 +12,8 @@
 #include "options.h"
 #include "heap.h"
 #include "debugtools.h"
+#include "ldt.h"
+#include "callback.h"
 
 DEFAULT_DEBUG_CHANNEL(aspi)
 
diff --git a/tools/wrc/dumpres.c b/tools/wrc/dumpres.c
index 3a46bfe45d3..4f849946948 100644
--- a/tools/wrc/dumpres.c
+++ b/tools/wrc/dumpres.c
@@ -5,10 +5,11 @@
  *
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <ctype.h>
 
-#include <config.h>
 #include "wrc.h"
 #include "dumpres.h"
 
diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c
index 140b26e57d6..1e8c4f93e0a 100644
--- a/tools/wrc/genres.c
+++ b/tools/wrc/genres.c
@@ -7,13 +7,14 @@
  *			  names in .s and .h files.  
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
 
-#include <config.h>
 #include "wrc.h"
 #include "genres.h"
 #include "utils.h"
diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c
index 69a2fbee353..4fba4833a86 100644
--- a/tools/wrc/newstruc.c
+++ b/tools/wrc/newstruc.c
@@ -6,13 +6,14 @@
  *
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include <string.h>
 
-#include <config.h>
 #include "wrc.h"
 #include "newstruc.h"
 #include "utils.h"
diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l
index 9b132d6ca9c..c1731d01c5c 100644
--- a/tools/wrc/parser.l
+++ b/tools/wrc/parser.l
@@ -94,12 +94,13 @@ cident	[a-zA-Z_][0-9a-zA-Z_]*
 
 /*#define LEX_DEBUG*/
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
-#include <config.h>
 #include "wrc.h"
 #include "utils.h"
 #include "preproc.h"
diff --git a/tools/wrc/preproc.c b/tools/wrc/preproc.c
index d523bc5ee79..cf033b5fdfc 100644
--- a/tools/wrc/preproc.c
+++ b/tools/wrc/preproc.c
@@ -3,11 +3,12 @@
  *
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <config.h>
 #include "wrc.h"
 #include "utils.h"
 #include "preproc.h"
diff --git a/tools/wrc/readres.c b/tools/wrc/readres.c
index 8fcb3c739d8..776c6595be6 100644
--- a/tools/wrc/readres.c
+++ b/tools/wrc/readres.c
@@ -5,12 +5,13 @@
  *
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
-#include <config.h>
 #include "wrc.h"
 #include "readres.h"
 #include "newstruc.h"
diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c
index 55ce0af29b0..3ff6656b2fb 100644
--- a/tools/wrc/utils.c
+++ b/tools/wrc/utils.c
@@ -5,6 +5,8 @@
  *
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -12,7 +14,6 @@
 #include <assert.h>
 #include <ctype.h>
 
-#include <config.h>
 #include "wrc.h"
 #include "utils.h"
 #include "parser.h"
diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c
index f9e1c6c59db..9cf6101d379 100644
--- a/tools/wrc/wrc.c
+++ b/tools/wrc/wrc.c
@@ -32,14 +32,16 @@
  *
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
 
-#include <config.h>
-#include <resource.h>	/* For HAVE_WINE_CONSTRUCTOR */
+#include "resource.h"	/* For HAVE_WINE_CONSTRUCTOR */
+
 #include "wrc.h"
 #include "utils.h"
 #include "writeres.h"
diff --git a/tools/wrc/writeres.c b/tools/wrc/writeres.c
index a48e1941cc0..6a3e68124d3 100644
--- a/tools/wrc/writeres.c
+++ b/tools/wrc/writeres.c
@@ -5,13 +5,14 @@
  *
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include <time.h>
 
-#include <config.h>
 #include "wrc.h"
 #include "writeres.h"
 #include "genres.h"