Module: wine Branch: master Commit: fd86c859180ef649351e96857daa89ac3ae232a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd86c859180ef649351e96857...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Feb 5 09:00:47 2020 +0100
libport: Move the collation table back to libwine and stop updating it.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 2 +- libs/{port => wine}/collation.c | 6 ++++++ tools/make_unicode | 1 - 4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 260140a391..74b6dcfb61 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -75,7 +75,6 @@ C_SRCS = \ c_949.c \ c_950.c \ casemap.c \ - collation.c \ compose.c \ cptable.c \ decompose.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index d26f0c2589..5850f0299d 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,7 +1,7 @@ EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(I386_LIBS)
- C_SRCS = \ + collation.c \ config.c \ cpsymbol.c \ debug.c \ diff --git a/libs/port/collation.c b/libs/wine/collation.c similarity index 99% rename from libs/port/collation.c rename to libs/wine/collation.c index 22c35a4c21..10e89126a5 100644 --- a/libs/port/collation.c +++ b/libs/wine/collation.c @@ -2,6 +2,10 @@ /* generated from http://www.unicode.org/reports/tr10/allkeys.txt */ /* DO NOT EDIT!! */
+#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "windef.h"
const unsigned int DECLSPEC_HIDDEN collation_table[11044] = @@ -1391,3 +1395,5 @@ const unsigned int DECLSPEC_HIDDEN collation_table[11044] = 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x09bf0111, 0x09c00111, 0xffffffff, 0xffffffff }; + +#endif /* __ASM_OBSOLETE */ diff --git a/tools/make_unicode b/tools/make_unicode index cd2f406793..caafce76cb 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2727,7 +2727,6 @@ sub REPLACE_IN_FILE($@) chdir ".." if -f "./make_unicode"; load_data( $DEFAULTS ); dump_case_mappings( "libs/port/casemap.c" ); -dump_sortkeys( "libs/port/collation.c" ); dump_sortkeys( "dlls/kernelbase/collation.c" ); dump_compose_table( "libs/port/compose.c" ); dump_compose_table( "dlls/kernelbase/compose.c" );