Always include "wrc.h" before including "ctype.h".

wrc.h includes wrctypes.h, which includes windef.h, which includes winnt.h. And winnt.h contains our wchar_t check, which has to be done before including ctype.h to enable building on Mac OS X hosts.

svn path=/trunk/; revision=28413

diff --git a/reactos/tools/wrc/dumpres.c b/reactos/tools/wrc/dumpres.c
index a121189..12e736c 100644 (file)
--- a/reactos/tools/wrc/dumpres.c
+++ b/reactos/tools/wrc/dumpres.c
@@ -18,11 +18,11 @@
 
 #include "config.h"
 
+#include "wrc.h"
 #include <assert.h>
 #include <stdio.h>
 #include <ctype.h>
 
-#include "wrc.h"
 #include "dumpres.h"
 
 /*

diff --git a/reactos/tools/wrc/genres.c b/reactos/tools/wrc/genres.c
index aacfbee..36b593d 100644 (file)
--- a/reactos/tools/wrc/genres.c
+++ b/reactos/tools/wrc/genres.c
@@ -27,6 +27,7 @@
 
 #include "config.h"
 
+#include "wrc.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -34,7 +35,6 @@
 #include <assert.h>
 #include <ctype.h>
 
-#include "wrc.h"
 #include "genres.h"
 #include "utils.h"
 #include "windef.h"

diff --git a/reactos/tools/wrc/lex.yy.c b/reactos/tools/wrc/lex.yy.c
index 38febde..8d982c9 100644 (file)
--- a/reactos/tools/wrc/lex.yy.c
+++ b/reactos/tools/wrc/lex.yy.c
@@ -720,6 +720,7 @@ char *yytext;
 
 /*#define LEX_DEBUG*/
 
+#include "wrc.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -727,7 +728,6 @@ char *yytext;
 #include <assert.h>
 
 #include "wine/unicode.h"
-#include "wrc.h"
 #include "utils.h"
 #include "parser.h"
 #include "newstruc.h"

diff --git a/reactos/tools/wrc/newstruc.c b/reactos/tools/wrc/newstruc.c
index 4786e9a..26a89df 100644 (file)
--- a/reactos/tools/wrc/newstruc.c
+++ b/reactos/tools/wrc/newstruc.c
@@ -21,13 +21,13 @@
 
 #include "config.h"
 
+#include "wrc.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
 
-#include "wrc.h"
 #include "newstruc.h"
 #include "utils.h"
 #include "parser.h"

diff --git a/reactos/tools/wrc/parser.l b/reactos/tools/wrc/parser.l
index aea3fb8..b0d20ae 100644 (file)
--- a/reactos/tools/wrc/parser.l
+++ b/reactos/tools/wrc/parser.l
@@ -98,6 +98,7 @@ cident        [a-zA-Z_][0-9a-zA-Z_]*
 
 /*#define LEX_DEBUG*/
 
+#include "wrc.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -105,7 +106,6 @@ cident      [a-zA-Z_][0-9a-zA-Z_]*
 #include <assert.h>
 
 #include "wine/unicode.h"
-#include "wrc.h"
 #include "utils.h"
 #include "parser.h"
 #include "newstruc.h"

diff --git a/reactos/tools/wrc/parser.tab.c b/reactos/tools/wrc/parser.tab.c
index 931a825..d3b91b0 100644 (file)
--- a/reactos/tools/wrc/parser.tab.c
+++ b/reactos/tools/wrc/parser.tab.c
@@ -352,6 +352,7 @@
 #include "config.h"
 #include "wine/port.h"
 
+#include "wrc.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -362,7 +363,6 @@
 #include <alloca.h>
 #endif
 
-#include "wrc.h"
 #include "utils.h"
 #include "newstruc.h"
 #include "dumpres.h"

diff --git a/reactos/tools/wrc/parser.y b/reactos/tools/wrc/parser.y
index 59c524c..423d912 100644 (file)
--- a/reactos/tools/wrc/parser.y
+++ b/reactos/tools/wrc/parser.y
@@ -123,6 +123,7 @@
 #include "config.h"
 #include "wine/port.h"
 
+#include "wrc.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -133,7 +134,6 @@
 #include <alloca.h>
 #endif
 
-#include "wrc.h"
 #include "utils.h"
 #include "newstruc.h"
 #include "dumpres.h"

diff --git a/reactos/tools/wrc/utils.c b/reactos/tools/wrc/utils.c
index 7c34e55..e778793 100644 (file)
--- a/reactos/tools/wrc/utils.c
+++ b/reactos/tools/wrc/utils.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 
+#include "wrc.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,7 +30,6 @@
 #include <ctype.h>
 
 #include "wine/unicode.h"
-#include "wrc.h"
 #include "utils.h"
 #include "parser.h"
 

diff --git a/reactos/tools/wrc/wrc.c b/reactos/tools/wrc/wrc.c
index d9086a8..9bf3d59 100644 (file)
--- a/reactos/tools/wrc/wrc.c
+++ b/reactos/tools/wrc/wrc.c
@@ -21,6 +21,7 @@
 
 #include "config.h"
 
+#include "wrc.h"
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
@@ -34,7 +35,6 @@
 # include <getopt.h>
 #endif
 
-#include "wrc.h"
 #include "utils.h"
 #include "readres.h"
 #include "dumpres.h"