From 98de631eb1ff9a54369c9adc27f49ff3240fb5dc Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 28 Oct 2013 14:20:58 +0100 Subject: [PATCH] wrc: Define WINE_UNICODE_API directly in the source. --- tools/wrc/Makefile.in | 2 +- tools/wrc/genres.c | 1 - tools/wrc/parser.l | 1 - tools/wrc/parser.y | 1 - tools/wrc/po.c | 1 - tools/wrc/utils.c | 1 - tools/wrc/wrc.h | 2 ++ tools/wrc/writeres.c | 1 - 8 files changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index a017891a418..e4210c0ae82 100644 --- a/tools/wrc/Makefile.in +++ b/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) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index e49d8a5e6c1..61b2b29097d 100644 --- a/tools/wrc/genres.c +++ b/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))) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 8c50a8a1493..16a487f5dd5 100644 --- a/tools/wrc/parser.l +++ b/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" diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index ff5932744f8..144ae03dfd6 100644 --- a/tools/wrc/parser.y +++ b/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" diff --git a/tools/wrc/po.c b/tools/wrc/po.c index d6ea262bd2e..1be76502b1d 100644 --- a/tools/wrc/po.c +++ b/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; diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index a45b338c7cc..4dc3364f782 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -28,7 +28,6 @@ #include #include -#include "wine/unicode.h" #include "wrc.h" #include "utils.h" #include "parser.h" diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index 74a65fe66b7..5892daf58ce 100644 --- a/tools/wrc/wrc.h +++ b/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 */ diff --git a/tools/wrc/writeres.c b/tools/wrc/writeres.c index 0bcad1623ba..07d4f748fe3 100644 --- a/tools/wrc/writeres.c +++ b/tools/wrc/writeres.c @@ -26,7 +26,6 @@ #include #include -#include "wine/unicode.h" #include "wrc.h" #include "genres.h" #include "newstruc.h"