[UNICODE] Re-trial to fix Travis build
authorKatayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Mon, 23 Dec 2019 08:05:38 +0000 (17:05 +0900)
committerKatayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Mon, 23 Dec 2019 08:05:38 +0000 (17:05 +0900)
sdk/tools/unicode/CMakeLists.txt
sdk/tools/unicode/casemap.c
sdk/tools/unicode/collation.c
sdk/tools/unicode/compose.c
sdk/tools/unicode/wctype.c

index 1a32c2e..85c668d 100644 (file)
@@ -1,6 +1,4 @@
 
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/psdk)
-
 add_definitions(-DDECLSPEC_HIDDEN=)
 
 list(APPEND SOURCE
index 2905000..b58fe22 100644 (file)
@@ -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] =
 {
index d4f15c3..61598a4 100644 (file)
@@ -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] =
 {
index b817d1a..a5cef41 100644 (file)
@@ -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] =
 {
index 661966c..d4eaf4a 100644 (file)
@@ -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] =
 {