[ros-diffs] [reactos] 01/01: [UNICODE] Re-trial to fix Travis build

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12c683a846dc644951ad3…

commit 12c683a846dc644951ad3d3f2f619dfb1f8bbbe2
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Mon Dec 23 17:05:38 2019 +0900
Commit:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
CommitDate: Mon Dec 23 17:05:38 2019 +0900

    [UNICODE] Re-trial to fix Travis build
---
 sdk/tools/unicode/CMakeLists.txt | 2 --
 sdk/tools/unicode/casemap.c      | 4 ++++
 sdk/tools/unicode/collation.c    | 4 ++++
 sdk/tools/unicode/compose.c      | 4 ++++
 sdk/tools/unicode/wctype.c       | 4 ++++
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/sdk/tools/unicode/CMakeLists.txt b/sdk/tools/unicode/CMakeLists.txt
index 1a32c2e4845..85c668dead7 100644
--- a/sdk/tools/unicode/CMakeLists.txt
+++ b/sdk/tools/unicode/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/psdk)
-
 add_definitions(-DDECLSPEC_HIDDEN=)
 
 list(APPEND SOURCE
diff --git a/sdk/tools/unicode/casemap.c b/sdk/tools/unicode/casemap.c
index 2905000c6e9..b58fe229498 100644
--- a/sdk/tools/unicode/casemap.c
+++ b/sdk/tools/unicode/casemap.c
@@ -2,7 +2,11 @@
 /* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */
 /* DO NOT EDIT!! */
 
+#ifdef __REACTOS__
+#include "wine/unicode.h"
+#else
 #include "windef.h"
+#endif
 
 const WCHAR wine_casemap_lower[4259] =
 {
diff --git a/sdk/tools/unicode/collation.c b/sdk/tools/unicode/collation.c
index d4f15c396ff..61598a4eec9 100644
--- a/sdk/tools/unicode/collation.c
+++ b/sdk/tools/unicode/collation.c
@@ -2,7 +2,11 @@
 /* generated from http://www.unicode.org/reports/tr10/allkeys.txt */
 /* DO NOT EDIT!! */
 
+#ifdef __REACTOS__
+#include "wine/unicode.h"
+#else
 #include "windef.h"
+#endif
 
 const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
 {
diff --git a/sdk/tools/unicode/compose.c b/sdk/tools/unicode/compose.c
index b817d1a0586..a5cef418a1d 100644
--- a/sdk/tools/unicode/compose.c
+++ b/sdk/tools/unicode/compose.c
@@ -2,7 +2,11 @@
 /* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */
 /* DO NOT EDIT!! */
 
+#ifdef __REACTOS__
+#include "wine/unicode.h"
+#else
 #include "windef.h"
+#endif
 
 static const WCHAR table[0x85e] =
 {
diff --git a/sdk/tools/unicode/wctype.c b/sdk/tools/unicode/wctype.c
index 661966c5a1f..d4eaf4a1931 100644
--- a/sdk/tools/unicode/wctype.c
+++ b/sdk/tools/unicode/wctype.c
@@ -1,7 +1,11 @@
 /* Unicode ctype tables */
 /* Automatically generated; DO NOT EDIT!! */
 
+#ifdef __REACTOS__
+#include "wine/unicode.h"
+#else
 #include "windef.h"
+#endif
 
 const unsigned short wine_wctype_table[17152] =
 {