From 18d410dec1b3fe4b74d448a200194987790c816c Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 8 Jul 2014 16:59:36 +0200
Subject: [PATCH] tools: Don't include wine/unicode.h if not necessary.

---
 dlls/gdi32/vertical.c      | 2 --
 dlls/kernel32/nameprep.c   | 4 +---
 dlls/usp10/indicsyllable.c | 2 --
 dlls/usp10/linebreak.c     | 2 --
 dlls/usp10/shaping.c       | 2 --
 dlls/wineps.drv/vertical.c | 2 --
 tools/make_unicode         | 7 +------
 7 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/dlls/gdi32/vertical.c b/dlls/gdi32/vertical.c
index 9430e2c57fc..67f0d0abc81 100644
--- a/dlls/gdi32/vertical.c
+++ b/dlls/gdi32/vertical.c
@@ -2,8 +2,6 @@
 /* generated from http://www.unicode.org/Public/vertical/revision-11/VerticalOrientation-11.txt */
 /* DO NOT EDIT!! */
 
-#include "wine/unicode.h"
-
 const unsigned short vertical_orientation_table[1536] =
 {
     /* level 1 offsets */
diff --git a/dlls/kernel32/nameprep.c b/dlls/kernel32/nameprep.c
index a293dac1444..cb6eb61dd62 100644
--- a/dlls/kernel32/nameprep.c
+++ b/dlls/kernel32/nameprep.c
@@ -2,8 +2,6 @@
 /* generated from http://www.rfc-editor.org/rfc/rfc3454.txt */
 /* DO NOT EDIT!! */
 
-#include "wine/unicode.h"
-
 const unsigned short nameprep_char_type[4432] =
 {
     /* level 1 offsets */
@@ -564,7 +562,7 @@ const unsigned short nameprep_char_type[4432] =
     0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
     0x0001, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002
 };
-const WCHAR nameprep_mapping[5856] =
+const unsigned short nameprep_mapping[5856] =
 {
     /* index */
     0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0100, 0x0100,
diff --git a/dlls/usp10/indicsyllable.c b/dlls/usp10/indicsyllable.c
index 91ab8ed1a91..821a10f7715 100644
--- a/dlls/usp10/indicsyllable.c
+++ b/dlls/usp10/indicsyllable.c
@@ -3,8 +3,6 @@
 /*       and from http://www.unicode.org/Public/7.0.0/ucd/IndicMatraCategory.txt */
 /* DO NOT EDIT!! */
 
-#include "wine/unicode.h"
-
 const unsigned short indic_syllabic_table[2864] =
 {
     /* level 1 offsets */
diff --git a/dlls/usp10/linebreak.c b/dlls/usp10/linebreak.c
index 89655f30beb..a0452c98728 100644
--- a/dlls/usp10/linebreak.c
+++ b/dlls/usp10/linebreak.c
@@ -2,8 +2,6 @@
 /* generated from http://www.unicode.org/Public/7.0.0/ucd/LineBreak.txt */
 /* DO NOT EDIT!! */
 
-#include "wine/unicode.h"
-
 const unsigned short wine_linebreak_table[7232] =
 {
     /* level 1 offsets */
diff --git a/dlls/usp10/shaping.c b/dlls/usp10/shaping.c
index fdbed9fd14c..12b290c4c0b 100644
--- a/dlls/usp10/shaping.c
+++ b/dlls/usp10/shaping.c
@@ -2,8 +2,6 @@
 /* generated from http://www.unicode.org/Public/7.0.0/ucd/ArabicShaping.txt */
 /* DO NOT EDIT!! */
 
-#include "wine/unicode.h"
-
 const unsigned short wine_shaping_table[2864] =
 {
     /* level 1 offsets */
diff --git a/dlls/wineps.drv/vertical.c b/dlls/wineps.drv/vertical.c
index 9430e2c57fc..67f0d0abc81 100644
--- a/dlls/wineps.drv/vertical.c
+++ b/dlls/wineps.drv/vertical.c
@@ -2,8 +2,6 @@
 /* generated from http://www.unicode.org/Public/vertical/revision-11/VerticalOrientation-11.txt */
 /* DO NOT EDIT!! */
 
-#include "wine/unicode.h"
-
 const unsigned short vertical_orientation_table[1536] =
 {
     /* level 1 offsets */
diff --git a/tools/make_unicode b/tools/make_unicode
index 0300905976c..e0f92b5f0ea 100755
--- a/tools/make_unicode
+++ b/tools/make_unicode
@@ -1234,7 +1234,6 @@ sub dump_indic($)
     print OUTPUT "/* generated from $UNIDATA/IndicSyllabicCategory.txt */\n";
     print OUTPUT "/*       and from $UNIDATA/IndicMatraCategory.txt */\n";
     print OUTPUT "/* DO NOT EDIT!! */\n\n";
-    print OUTPUT "#include \"wine/unicode.h\"\n\n";
 
     dump_two_level_mapping( "indic_syllabic_table", @indic_table);
 
@@ -1282,7 +1281,6 @@ sub dump_linebreak($)
     print OUTPUT "/* Unicode Line Break Properties */\n";
     print OUTPUT "/* generated from $UNIDATA/LineBreak.txt */\n";
     print OUTPUT "/* DO NOT EDIT!! */\n\n";
-    print OUTPUT "#include \"wine/unicode.h\"\n\n";
 
     dump_two_level_mapping( "wine_linebreak_table", @break_table);
 
@@ -1358,7 +1356,6 @@ sub dump_shaping($)
     print OUTPUT "/* Unicode Arabic shaping */\n";
     print OUTPUT "/* generated from $UNIDATA/ArabicShaping.txt */\n";
     print OUTPUT "/* DO NOT EDIT!! */\n\n";
-    print OUTPUT "#include \"wine/unicode.h\"\n\n";
 
     dump_two_level_mapping( "wine_shaping_table", @joining_table );
 
@@ -1419,7 +1416,6 @@ sub dump_vertical($)
     print OUTPUT "/* Unicode Vertical Orientation */\n";
     print OUTPUT "/* generated from $VERTICALDATA/VerticalOrientation-11.txt */\n";
     print OUTPUT "/* DO NOT EDIT!! */\n\n";
-    print OUTPUT "#include \"wine/unicode.h\"\n\n";
 
     dump_two_level_mapping( "vertical_orientation_table", @vertical_table);
 
@@ -1755,7 +1751,6 @@ sub dump_nameprep($)
     print OUTPUT "/* Nameprep algorithm related data */\n";
     print OUTPUT "/* generated from $RFCS/$STRINGPREP */\n";
     print OUTPUT "/* DO NOT EDIT!! */\n\n";
-    print OUTPUT "#include \"wine/unicode.h\"\n\n";
 
     dump_two_level_mapping( "nameprep_char_type", @flags_table );
 
@@ -1793,7 +1788,7 @@ sub dump_nameprep($)
     }
 
     # dump the main index
-    printf OUTPUT "const WCHAR nameprep_mapping[%d] =\n", $total;
+    printf OUTPUT "const unsigned short nameprep_mapping[%d] =\n", $total;
     printf OUTPUT "{\n    /* index */\n";
     printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @filled_idx );
     printf OUTPUT ",\n    /* null sub-index */\n%s", DUMP_ARRAY( "0x%04x", 0, ($null_offset) x 16 );