From 333e6b3c69369367fbca9953b6224cb740376cf6 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 22 May 2019 17:34:45 +0200 Subject: [PATCH] make_unicode: Avoid including wine/unicode.h in generated files. Signed-off-by: Alexandre Julliard --- dlls/dwrite/bracket.c | 2 +- dlls/dwrite/linebreak.c | 2 +- dlls/dwrite/mirror.c | 2 +- dlls/dwrite/scripts.c | 2 +- dlls/gdi32/vertical.c | 2 +- dlls/kernel32/nameprep.c | 2 +- dlls/usp10/bracket.c | 2 +- dlls/usp10/indicsyllable.c | 2 +- dlls/usp10/linebreak.c | 2 +- dlls/usp10/mirror.c | 2 +- dlls/usp10/shaping.c | 2 +- dlls/wineps.drv/vertical.c | 2 +- libs/port/casemap.c | 2 +- libs/port/collation.c | 2 +- libs/port/combclass.c | 2 +- libs/port/compose.c | 2 +- libs/port/digitmap.c | 2 +- libs/port/wctype.c | 2 +- tools/make_unicode | 28 ++++++++++++++-------------- 19 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/dwrite/bracket.c b/dlls/dwrite/bracket.c index cd573d3df77..210495f38f1 100644 --- a/dlls/dwrite/bracket.c +++ b/dlls/dwrite/bracket.c @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiBrackets.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +#include "windef.h" const unsigned short DECLSPEC_HIDDEN bidi_bracket_table[768] = { diff --git a/dlls/dwrite/linebreak.c b/dlls/dwrite/linebreak.c index 804b60a8a5c..904efc6538c 100644 --- a/dlls/dwrite/linebreak.c +++ b/dlls/dwrite/linebreak.c @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/12.0.0/ucd/LineBreak.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +#include "windef.h" const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7216] = { diff --git a/dlls/dwrite/mirror.c b/dlls/dwrite/mirror.c index 5c4abcd69a8..7b43a85703c 100644 --- a/dlls/dwrite/mirror.c +++ b/dlls/dwrite/mirror.c @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiMirroring.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +#include "windef.h" const WCHAR DECLSPEC_HIDDEN wine_mirror_map[3544] = { diff --git a/dlls/dwrite/scripts.c b/dlls/dwrite/scripts.c index 23514efa577..cb073a238c8 100644 --- a/dlls/dwrite/scripts.c +++ b/dlls/dwrite/scripts.c @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/12.0.0/ucd/Scripts.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +#include "windef.h" const unsigned short DECLSPEC_HIDDEN wine_scripts_table[6736] = { diff --git a/dlls/gdi32/vertical.c b/dlls/gdi32/vertical.c index 1738deece6c..b5baffdde5d 100644 --- a/dlls/gdi32/vertical.c +++ b/dlls/gdi32/vertical.c @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/12.0.0/ucd/VerticalOrientation.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +#include "windef.h" const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] = { diff --git a/dlls/kernel32/nameprep.c b/dlls/kernel32/nameprep.c index 7aa03367d31..1dd8ed120c9 100644 --- a/dlls/kernel32/nameprep.c +++ b/dlls/kernel32/nameprep.c @@ -2,7 +2,7 @@ /* generated from http://www.rfc-editor.org/rfc/rfc3454.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +#include "windef.h" const unsigned short DECLSPEC_HIDDEN nameprep_char_type[4432] = { diff --git a/dlls/usp10/bracket.c b/dlls/usp10/bracket.c index cd573d3df77..210495f38f1 100644 --- a/dlls/usp10/bracket.c +++ b/dlls/usp10/bracket.c @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiBrackets.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +#include "windef.h" const unsigned short DECLSPEC_HIDDEN bidi_bracket_table[768] = { diff --git a/dlls/usp10/indicsyllable.c b/dlls/usp10/indicsyllable.c index d436e8a55c8..bc13fec2940 100644 --- a/dlls/usp10/indicsyllable.c +++ b/dlls/usp10/indicsyllable.c @@ -3,7 +3,7 @@ /* and from http://www.unicode.org/Public/12.0.0/ucd/IndicPositionalCategory.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +#include "windef.h" const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3344] = { diff --git a/dlls/usp10/linebreak.c b/dlls/usp10/linebreak.c index 804b60a8a5c..904efc6538c 100644 --- a/dlls/usp10/linebreak.c +++ b/dlls/usp10/linebreak.c @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/12.0.0/ucd/LineBreak.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +#include "windef.h" const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7216] = { diff --git a/dlls/usp10/mirror.c b/dlls/usp10/mirror.c index 5c4abcd69a8..7b43a85703c 100644 --- a/dlls/usp10/mirror.c +++ b/dlls/usp10/mirror.c @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiMirroring.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +#include "windef.h" const WCHAR DECLSPEC_HIDDEN wine_mirror_map[3544] = { diff --git a/dlls/usp10/shaping.c b/dlls/usp10/shaping.c index 08e185e85e4..ebb6fae5097 100644 --- a/dlls/usp10/shaping.c +++ b/dlls/usp10/shaping.c @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/12.0.0/ucd/ArabicShaping.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +#include "windef.h" const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2944] = { diff --git a/dlls/wineps.drv/vertical.c b/dlls/wineps.drv/vertical.c index 1738deece6c..b5baffdde5d 100644 --- a/dlls/wineps.drv/vertical.c +++ b/dlls/wineps.drv/vertical.c @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/12.0.0/ucd/VerticalOrientation.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +#include "windef.h" const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] = { diff --git a/libs/port/casemap.c b/libs/port/casemap.c index 3888109d09f..2905000c6e9 100644 --- a/libs/port/casemap.c +++ b/libs/port/casemap.c @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +#include "windef.h" const WCHAR wine_casemap_lower[4259] = { diff --git a/libs/port/collation.c b/libs/port/collation.c index 2d990d8280a..f56cf02c2dd 100644 --- a/libs/port/collation.c +++ b/libs/port/collation.c @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/reports/tr10/allkeys.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +#include "windef.h" const unsigned int DECLSPEC_HIDDEN collation_table[12800] = { diff --git a/libs/port/combclass.c b/libs/port/combclass.c index 48a2ff4e772..f5c794a3e4a 100644 --- a/libs/port/combclass.c +++ b/libs/port/combclass.c @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +#include "windef.h" const unsigned short DECLSPEC_HIDDEN combining_class_table[2208] = { diff --git a/libs/port/compose.c b/libs/port/compose.c index 4a0c5100b86..b817d1a0586 100644 --- a/libs/port/compose.c +++ b/libs/port/compose.c @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +#include "windef.h" static const WCHAR table[0x85e] = { diff --git a/libs/port/digitmap.c b/libs/port/digitmap.c index 278e2273162..99be4765450 100644 --- a/libs/port/digitmap.c +++ b/libs/port/digitmap.c @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +#include "windef.h" const WCHAR DECLSPEC_HIDDEN wine_digitmap[5933] = { diff --git a/libs/port/wctype.c b/libs/port/wctype.c index da19148f2af..661966c5a1f 100644 --- a/libs/port/wctype.c +++ b/libs/port/wctype.c @@ -1,7 +1,7 @@ /* Unicode ctype tables */ /* Automatically generated; DO NOT EDIT!! */ -#include "wine/unicode.h" +#include "windef.h" const unsigned short wine_wctype_table[17152] = { diff --git a/tools/make_unicode b/tools/make_unicode index 4a6f4d02df8..ca09d240765 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -922,7 +922,7 @@ sub dump_sortkeys($@) printf OUTPUT "/* Unicode collation element table */\n"; printf OUTPUT "/* generated from %s */\n", "$REPORTS/$SORTKEYS"; printf OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; + print OUTPUT "#include \"windef.h\"\n\n"; printf OUTPUT "const unsigned int DECLSPEC_HIDDEN collation_table[%d] =\n{\n", $ranges*256; printf OUTPUT " /* index */\n"; @@ -1326,7 +1326,7 @@ sub dump_indic($) print OUTPUT "/* generated from $UNIDATA/IndicSyllabicCategory.txt */\n"; print OUTPUT "/* and from $UNIDATA/IndicPositionalCategory.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; + print OUTPUT "#include \"windef.h\"\n\n"; dump_two_level_mapping( "indic_syllabic_table", $indic_types{'Other'}, @indic_table ); @@ -1391,7 +1391,7 @@ 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"; + print OUTPUT "#include \"windef.h\"\n\n"; dump_two_level_mapping( "wine_linebreak_table", $break_types{'XX'}, @break_table ); @@ -1618,7 +1618,7 @@ sub dump_scripts($) print OUTPUT "/* Unicode Script IDs */\n"; print OUTPUT "/* generated from $UNIDATA/Scripts.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; + print OUTPUT "#include \"windef.h\"\n\n"; dump_two_level_mapping( "wine_scripts_table", 0, @scripts_table ); close OUTPUT; @@ -1652,7 +1652,7 @@ sub dump_mirroring($) print OUTPUT "/* Unicode BiDi mirroring */\n"; print OUTPUT "/* generated from $UNIDATA/BidiMirroring.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; + print OUTPUT "#include \"windef.h\"\n\n"; dump_case_table( "DECLSPEC_HIDDEN wine_mirror_map", @mirror_table ); close OUTPUT; save_file($filename); @@ -1689,7 +1689,7 @@ sub dump_bracket($) print OUTPUT "/* Unicode Bidirectional Bracket table */\n"; print OUTPUT "/* generated from $UNIDATA/BidiBrackets.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; + print OUTPUT "#include \"windef.h\"\n\n"; dump_two_level_mapping( "bidi_bracket_table", 0, @bracket_table ); @@ -1730,7 +1730,7 @@ 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"; + print OUTPUT "#include \"windef.h\"\n\n"; dump_two_level_mapping( "wine_shaping_table", 0, @joining_table ); @@ -1791,7 +1791,7 @@ sub dump_vertical($) print OUTPUT "/* Unicode Vertical Orientation */\n"; print OUTPUT "/* generated from $UNIDATA/VerticalOrientation.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; + print OUTPUT "#include \"windef.h\"\n\n"; dump_two_level_mapping( "vertical_orientation_table", $vertical_types{'R'}, @vertical_table ); @@ -1809,7 +1809,7 @@ sub dump_digit_folding($) print OUTPUT "/* Unicode digit folding mappings */\n"; print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; + print OUTPUT "#include \"windef.h\"\n\n"; dump_case_table( "DECLSPEC_HIDDEN wine_digitmap", @digitmap_table ); print OUTPUT "\n"; @@ -1829,7 +1829,7 @@ sub dump_case_mappings($) print OUTPUT "/* Unicode case mappings */\n"; print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; + print OUTPUT "#include \"windef.h\"\n\n"; dump_case_table( "wine_casemap_lower", @tolower_table ); print OUTPUT "\n"; @@ -2151,7 +2151,7 @@ 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"; + print OUTPUT "#include \"windef.h\"\n\n"; dump_two_level_mapping( "nameprep_char_type", 0, @flags_table ); @@ -2293,7 +2293,7 @@ sub dump_ctype_tables($) printf "Building $filename\n"; printf OUTPUT "/* Unicode ctype tables */\n"; printf OUTPUT "/* Automatically generated; DO NOT EDIT!! */\n\n"; - printf OUTPUT "#include \"wine/unicode.h\"\n\n"; + printf OUTPUT "#include \"windef.h\"\n\n"; my @table = @category_table; @@ -2321,7 +2321,7 @@ sub dump_compose_table($) print OUTPUT "/* Unicode char composition */\n"; print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; + print OUTPUT "#include \"windef.h\"\n\n"; my @filled = (); foreach my $i (@compose_table) @@ -2641,7 +2641,7 @@ sub dump_combining_class($) print OUTPUT "/* Unicode Combining Classes */\n"; print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; + print OUTPUT "#include \"windef.h\"\n\n"; dump_two_level_mapping( "combining_class_table", 0, @combining_class_table ); close OUTPUT;