Module: wine Branch: master Commit: 98de631eb1ff9a54369c9adc27f49ff3240fb5dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=98de631eb1ff9a54369c9adc27...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Oct 28 14:20:58 2013 +0100
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 a017891..e4210c0 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 e49d8a5..61b2b29 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 8c50a8a..16a487f 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 ff59327..144ae03 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 d6ea262..1be7650 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 a45b338..4dc3364 100644 --- a/tools/wrc/utils.c +++ b/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" diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index 74a65fe..5892daf 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 0bcad16..07d4f74 100644 --- a/tools/wrc/writeres.c +++ b/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"