[ros-diffs] [cfinck] 28413: 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.
cfinck at svn.reactos.org
cfinck at svn.reactos.org
Sat Aug 18 23:41:26 CEST 2007
Author: cfinck
Date: Sun Aug 19 01:41:26 2007
New Revision: 28413
URL: http://svn.reactos.org/svn/reactos?rev=28413&view=rev
Log:
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.
Modified:
trunk/reactos/tools/wrc/dumpres.c
trunk/reactos/tools/wrc/genres.c
trunk/reactos/tools/wrc/lex.yy.c
trunk/reactos/tools/wrc/newstruc.c
trunk/reactos/tools/wrc/parser.l
trunk/reactos/tools/wrc/parser.tab.c
trunk/reactos/tools/wrc/parser.y
trunk/reactos/tools/wrc/utils.c
trunk/reactos/tools/wrc/wrc.c
Modified: trunk/reactos/tools/wrc/dumpres.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/dumpres.c?rev=28413&r1=28412&r2=28413&view=diff
==============================================================================
--- trunk/reactos/tools/wrc/dumpres.c (original)
+++ trunk/reactos/tools/wrc/dumpres.c Sun Aug 19 01:41:26 2007
@@ -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"
/*
Modified: trunk/reactos/tools/wrc/genres.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/genres.c?rev=28413&r1=28412&r2=28413&view=diff
==============================================================================
--- trunk/reactos/tools/wrc/genres.c (original)
+++ trunk/reactos/tools/wrc/genres.c Sun Aug 19 01:41:26 2007
@@ -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"
Modified: trunk/reactos/tools/wrc/lex.yy.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/lex.yy.c?rev=28413&r1=28412&r2=28413&view=diff
==============================================================================
--- trunk/reactos/tools/wrc/lex.yy.c (original)
+++ trunk/reactos/tools/wrc/lex.yy.c Sun Aug 19 01:41:26 2007
@@ -720,6 +720,7 @@
/*#define LEX_DEBUG*/
+#include "wrc.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -727,7 +728,6 @@
#include <assert.h>
#include "wine/unicode.h"
-#include "wrc.h"
#include "utils.h"
#include "parser.h"
#include "newstruc.h"
Modified: trunk/reactos/tools/wrc/newstruc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/newstruc.c?rev=28413&r1=28412&r2=28413&view=diff
==============================================================================
--- trunk/reactos/tools/wrc/newstruc.c (original)
+++ trunk/reactos/tools/wrc/newstruc.c Sun Aug 19 01:41:26 2007
@@ -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"
Modified: trunk/reactos/tools/wrc/parser.l
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.l?rev=28413&r1=28412&r2=28413&view=diff
==============================================================================
--- trunk/reactos/tools/wrc/parser.l (original)
+++ trunk/reactos/tools/wrc/parser.l Sun Aug 19 01:41:26 2007
@@ -98,6 +98,7 @@
/*#define LEX_DEBUG*/
+#include "wrc.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -105,7 +106,6 @@
#include <assert.h>
#include "wine/unicode.h"
-#include "wrc.h"
#include "utils.h"
#include "parser.h"
#include "newstruc.h"
Modified: trunk/reactos/tools/wrc/parser.tab.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.tab.c?rev=28413&r1=28412&r2=28413&view=diff
==============================================================================
--- trunk/reactos/tools/wrc/parser.tab.c (original)
+++ trunk/reactos/tools/wrc/parser.tab.c Sun Aug 19 01:41:26 2007
@@ -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"
Modified: trunk/reactos/tools/wrc/parser.y
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.y?rev=28413&r1=28412&r2=28413&view=diff
==============================================================================
--- trunk/reactos/tools/wrc/parser.y (original)
+++ trunk/reactos/tools/wrc/parser.y Sun Aug 19 01:41:26 2007
@@ -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"
Modified: trunk/reactos/tools/wrc/utils.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/utils.c?rev=28413&r1=28412&r2=28413&view=diff
==============================================================================
--- trunk/reactos/tools/wrc/utils.c (original)
+++ trunk/reactos/tools/wrc/utils.c Sun Aug 19 01:41:26 2007
@@ -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"
Modified: trunk/reactos/tools/wrc/wrc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.c?rev=28413&r1=28412&r2=28413&view=diff
==============================================================================
--- trunk/reactos/tools/wrc/wrc.c (original)
+++ trunk/reactos/tools/wrc/wrc.c Sun Aug 19 01:41:26 2007
@@ -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"
More information about the Ros-diffs
mailing list