wrc: Define WINE_UNICODE_API directly in the source.

tools/wrc/Makefile.in

@@ -1,4 +1,4 @@
-EXTRADEFS = -DINCLUDEDIR="\"$(includedir)\"" -DWINE_UNICODE_API=""
+EXTRADEFS = -DINCLUDEDIR="\"$(includedir)\""
 PROGRAMS = wrc$(EXEEXT)
 MANPAGE  = wrc.man
 ALL_LIBS = @LIBGETTEXTPO@ $(LIBWPP) $(LIBWINE_STATIC) $(LIBPORT)

tools/wrc/genres.c

@@ -41,7 +41,6 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "wine/unicode.h"
 
 #define SetResSize(res, tag)	set_dword((res), (tag), (res)->size - get_dword((res), (tag)))
 

tools/wrc/parser.l

@@ -112,7 +112,6 @@ cident	[a-zA-Z_][0-9a-zA-Z_]*
 #define YY_NO_UNISTD_H
 #endif
 
-#include "wine/unicode.h"
 #include "wrc.h"
 #include "utils.h"
 #include "parser.h"

tools/wrc/parser.y

@@ -135,7 +135,6 @@
 #include "newstruc.h"
 #include "dumpres.h"
 #include "wine/wpp.h"
-#include "wine/unicode.h"
 #include "parser.h"
 #include "windef.h"
 #include "winbase.h"

tools/wrc/po.c

@@ -40,7 +40,6 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "wine/list.h"
-#include "wine/unicode.h"
 
 static resource_t *new_top, *new_tail;
 

tools/wrc/utils.c

@@ -28,7 +28,6 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "wine/unicode.h"
 #include "wrc.h"
 #include "utils.h"
 #include "parser.h"

tools/wrc/wrc.h

@@ -21,6 +21,8 @@
 #ifndef __WRC_WRC_H
 #define __WRC_WRC_H
 
+#define WINE_UNICODE_API /* nothing */
+#include "wine/unicode.h"
 #include "wrctypes.h"
 
 /* From wrc.c */

tools/wrc/writeres.c

@@ -26,7 +26,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "wine/unicode.h"
 #include "wrc.h"
 #include "genres.h"
 #include "newstruc.h"