ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libwine: Move wctype tables to libwine_port. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-03-23 13:35:33 +01:00
parent c988910cae
commit a67dca1bc8
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wine/unicode.h
View File

@ -138,7 +138,7 @@ WINE_UNICODE_INLINE WCHAR toupperW( WCHAR ch )
/* and the C2_* type in the high 4 bits */ /* and the C2_* type in the high 4 bits */
WINE_UNICODE_INLINE unsigned short get_char_typeW( WCHAR ch ) 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)]; return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)];
} }

3
libs/port/Makefile.in
View File

@ -102,4 +102,5 @@ C_SRCS = \
symlink.c \ symlink.c \
usleep.c \ usleep.c \
utf8.c \ utf8.c \
wctomb.c wctomb.c \
wctype.c

2
libs/wine/wctype.c → libs/port/wctype.c
View File

@ -3,7 +3,7 @@
#include "wine/unicode.h" #include "wine/unicode.h"
const unsigned short wine_wctype_table[17152] = const unsigned short DECLSPEC_HIDDEN wine_wctype_table[17152] =
{ {
/* offsets */ /* offsets */
0x0100, 0x0200, 0x0300, 0x0400, 0x0500, 0x0600, 0x0700, 0x0800, 0x0100, 0x0200, 0x0300, 0x0400, 0x0500, 0x0600, 0x0700, 0x0800,

3
libs/wine/Makefile.in
View File

@ -11,8 +11,7 @@ C_SRCS = \
mmap.c \ mmap.c \
port.c \ port.c \
sortkey.c \ sortkey.c \
string.c \ string.c
wctype.c
EXTRA_OBJS = version.o EXTRA_OBJS = version.o

6
tools/make_unicode
View File

@ -1891,7 +1891,7 @@ sub dump_simple_mapping($$@)
my $def = shift; my $def = shift;
my @array = compress_array( 256, $def, @_[0..65535] ); 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 " /* 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] ); 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 # dump the ctype tables
sub DUMP_CTYPE_TABLES($) sub dump_ctype_tables($)
{ {
my $filename = shift; my $filename = shift;
open OUTPUT,">$filename.new" or die "Cannot create $filename"; 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_SORTKEYS( "libs/wine/collation.c", READ_SORTKEYS_FILE() );
dump_compose_table( "libs/port/compose.c" ); dump_compose_table( "libs/port/compose.c" );
dump_decompose_table( "libs/port/decompose.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_digit_folding( "libs/port/digitmap.c" );
dump_combining_class( "libs/port/combclass.c" ); dump_combining_class( "libs/port/combclass.c" );
dump_mirroring( "dlls/usp10/mirror.c" ); dump_mirroring( "dlls/usp10/mirror.c" );