Module: wine Branch: master Commit: a67dca1bc814900189912bda837d9ea881d7474e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a67dca1bc814900189912bda8...
Author: Alexandre Julliard julliard@winehq.org Date: Sat Mar 23 13:35:33 2019 +0100
libwine: Move wctype tables to libwine_port.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
include/wine/unicode.h | 2 +- libs/port/Makefile.in | 3 ++- libs/{wine => port}/wctype.c | 2 +- libs/wine/Makefile.in | 3 +-- tools/make_unicode | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/wine/unicode.h b/include/wine/unicode.h index a4b483a..de3ac56 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -138,7 +138,7 @@ WINE_UNICODE_INLINE WCHAR toupperW( WCHAR ch ) /* and the C2_* type in the high 4 bits */ WINE_UNICODE_INLINE unsigned short get_char_typeW( WCHAR ch ) { - extern WINE_UNICODE_API const unsigned short wine_wctype_table[]; + extern const unsigned short wine_wctype_table[]; return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)]; }
diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 86b9022..45ce182 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -102,4 +102,5 @@ C_SRCS = \ symlink.c \ usleep.c \ utf8.c \ - wctomb.c + wctomb.c \ + wctype.c diff --git a/libs/wine/wctype.c b/libs/port/wctype.c similarity index 99% rename from libs/wine/wctype.c rename to libs/port/wctype.c index 4153cb8..bb0eab5 100644 --- a/libs/wine/wctype.c +++ b/libs/port/wctype.c @@ -3,7 +3,7 @@
#include "wine/unicode.h"
-const unsigned short wine_wctype_table[17152] = +const unsigned short DECLSPEC_HIDDEN wine_wctype_table[17152] = { /* offsets */ 0x0100, 0x0200, 0x0300, 0x0400, 0x0500, 0x0600, 0x0700, 0x0800, diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 4833eb5..e544d99 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -11,8 +11,7 @@ C_SRCS = \ mmap.c \ port.c \ sortkey.c \ - string.c \ - wctype.c + string.c
EXTRA_OBJS = version.o
diff --git a/tools/make_unicode b/tools/make_unicode index bbd26e4..d674570 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1891,7 +1891,7 @@ sub dump_simple_mapping($$@) my $def = shift; my @array = compress_array( 256, $def, @_[0..65535] );
- printf OUTPUT "const unsigned short %s[%d] =\n{\n", $name, $#array+1; + printf OUTPUT "const unsigned short DECLSPEC_HIDDEN %s[%d] =\n{\n", $name, $#array+1; printf OUTPUT " /* offsets */\n%s,\n", DUMP_ARRAY( "0x%04x", 0, @array[0..255] ); printf OUTPUT " /* values */\n%s\n};\n", DUMP_ARRAY( "0x%04x", 0, @array[256..$#array] ); } @@ -2178,7 +2178,7 @@ sub dump_nameprep($)
################################################################ # dump the ctype tables -sub DUMP_CTYPE_TABLES($) +sub dump_ctype_tables($) { my $filename = shift; open OUTPUT,">$filename.new" or die "Cannot create $filename"; @@ -2770,7 +2770,7 @@ DUMP_CASE_MAPPINGS( "libs/wine/casemap.c" ); DUMP_SORTKEYS( "libs/wine/collation.c", READ_SORTKEYS_FILE() ); dump_compose_table( "libs/port/compose.c" ); dump_decompose_table( "libs/port/decompose.c" ); -DUMP_CTYPE_TABLES( "libs/wine/wctype.c" ); +dump_ctype_tables( "libs/port/wctype.c" ); dump_digit_folding( "libs/port/digitmap.c" ); dump_combining_class( "libs/port/combclass.c" ); dump_mirroring( "dlls/usp10/mirror.c" );