Module: wine Branch: master Commit: 84cd9043347c320f0747005bf66e1e7b1e17b25a URL: https://source.winehq.org/git/wine.git/?a=commit;h=84cd9043347c320f0747005bf...
Author: Alexandre Julliard julliard@winehq.org Date: Sat Mar 23 13:43:17 2019 +0100
libwine: Move collation table to libwine_port.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
include/wine/unicode.h | 8 -------- libs/port/Makefile.in | 2 ++ libs/{wine => port}/collation.c | 4 +++- libs/{wine => port}/sortkey.c | 0 libs/wine/Makefile.in | 3 --- libs/wine/port.c | 1 + tools/make_unicode | 7 ++++--- 7 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/include/wine/unicode.h b/include/wine/unicode.h index d0bbdcc..22bb6dd 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -35,14 +35,6 @@ extern "C" { #endif
-#ifndef WINE_UNICODE_API -# if defined(_MSC_VER) || defined(__MINGW32__) -# define WINE_UNICODE_API DECLSPEC_IMPORT -# else -# define WINE_UNICODE_API -# endif -#endif - #ifndef WINE_UNICODE_INLINE #define WINE_UNICODE_INLINE static inline #endif diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index e2b265d..ef3b23f 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -74,6 +74,7 @@ C_SRCS = \ c_949.c \ c_950.c \ casemap.c \ + collation.c \ combclass.c \ compose.c \ cpsymbol.c \ @@ -97,6 +98,7 @@ C_SRCS = \ pwrite.c \ readlink.c \ rint.c \ + sortkey.c \ spawn.c \ statvfs.c \ strnlen.c \ diff --git a/libs/wine/collation.c b/libs/port/collation.c similarity index 99% rename from libs/wine/collation.c rename to libs/port/collation.c index 465d740..2d990d8 100644 --- a/libs/wine/collation.c +++ b/libs/port/collation.c @@ -2,7 +2,9 @@ /* generated from http://www.unicode.org/reports/tr10/allkeys.txt */ /* DO NOT EDIT!! */
-const unsigned int collation_table[12800] = +#include "wine/unicode.h" + +const unsigned int DECLSPEC_HIDDEN collation_table[12800] = { /* index */ 0x00000200, 0x00000300, 0x00000400, 0x00000500, 0x00000600, 0x00000700, 0x00000800, 0x00000900, diff --git a/libs/wine/sortkey.c b/libs/port/sortkey.c similarity index 100% rename from libs/wine/sortkey.c rename to libs/port/sortkey.c diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index b8f26af..bd8a937 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,15 +1,12 @@ EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) -EXTRADEFS = -DWINE_UNICODE_API=""
C_SRCS = \ - collation.c \ config.c \ debug.c \ ldt.c \ loader.c \ mmap.c \ port.c \ - sortkey.c \ string.c
EXTRA_OBJS = version.o diff --git a/libs/wine/port.c b/libs/wine/port.c index 29e9091..666c4ca 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -33,6 +33,7 @@ #ifndef __ANDROID__ const void *libwine_port_functions[] = { + wine_compare_string, wine_cp_enum_table, wine_cp_get_table, wine_cp_mbstowcs, diff --git a/tools/make_unicode b/tools/make_unicode index a9acc27..0f3cdcc 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -844,7 +844,7 @@ sub READ_SORTKEYS_FILE()
################################################################ # build the sort keys table -sub DUMP_SORTKEYS($@) +sub dump_sortkeys($@) { my ($filename, @keys) = @_;
@@ -868,8 +868,9 @@ 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";
- printf OUTPUT "const unsigned int collation_table[%d] =\n{\n", $ranges*256; + printf OUTPUT "const unsigned int DECLSPEC_HIDDEN collation_table[%d] =\n{\n", $ranges*256; printf OUTPUT " /* index */\n"; printf OUTPUT "%s,\n", DUMP_ARRAY( "0x%08x", 0, @offsets );
@@ -2767,7 +2768,7 @@ sub REPLACE_IN_FILE($@) chdir ".." if -f "./make_unicode"; READ_DEFAULTS( $DEFAULTS ); dump_case_mappings( "libs/port/casemap.c" ); -DUMP_SORTKEYS( "libs/wine/collation.c", READ_SORTKEYS_FILE() ); +dump_sortkeys( "libs/port/collation.c", READ_SORTKEYS_FILE() ); dump_compose_table( "libs/port/compose.c" ); dump_decompose_table( "libs/port/decompose.c" ); dump_ctype_tables( "libs/port/wctype.c" );