Alexandre Julliard : libport: Move the composition tables back to libwine and stop updating them.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 23cee79d72bb64d824ec07350dedb7bfc23f8029
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=23cee79d72bb64d824ec07350...

Author: Alexandre Julliard 
Date:   Mon Feb 17 10:30:23 2020 +0100

libport: Move the composition tables back to libwine and stop updating them.

Signed-off-by: Alexandre Julliard

---

libs/port/Makefile.in           | 2 --
 libs/wine/Makefile.in           | 2 ++
 libs/{port => wine}/compose.c   | 6 ++++++
 libs/{port => wine}/decompose.c | 6 ++++++
 tools/make_unicode              | 2 --
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index 56b8371d8e..08e143d26d 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -2,8 +2,6 @@ STATICLIB = libwine_port.a

C_SRCS = \
    casemap.c \
-	compose.c \
-	decompose.c \
    ffs.c \
    fstatvfs.c \
    getopt.c \
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index 01cfc6ba99..66ecf13c67 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -67,10 +67,12 @@ C_SRCS = \
    c_949.c \
    c_950.c \
    collation.c \
+	compose.c \
    config.c \
    cpsymbol.c \
    cptable.c \
    debug.c \
+	decompose.c \
    digitmap.c \
    fold.c \
    ldt.c \
diff --git a/libs/port/compose.c b/libs/wine/compose.c
similarity index 99%
rename from libs/port/compose.c
rename to libs/wine/compose.c
index 4a23b5a92d..12febcf6cd 100644
--- a/libs/port/compose.c
+++ b/libs/wine/compose.c
@@ -2,6 +2,10 @@
 /* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:UnicodeData.txt */
 /* DO NOT EDIT!! */

+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "windef.h"

static const WCHAR table[0x85e] =
@@ -403,3 +407,5 @@ WCHAR DECLSPEC_HIDDEN wine_compose( const WCHAR *str )
         count = table[2 * pos + 3];
     }
 }
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/decompose.c b/libs/wine/decompose.c
similarity index 99%
rename from libs/port/decompose.c
rename to libs/wine/decompose.c
index 8c09dd5526..e75a7ca3ac 100644
--- a/libs/port/decompose.c
+++ b/libs/wine/decompose.c
@@ -2,6 +2,10 @@
 /* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:UnicodeData.txt */
 /* DO NOT EDIT!! */

+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "windef.h"

const WCHAR DECLSPEC_HIDDEN nfd_table[6075] =
@@ -959,3 +963,5 @@ const WCHAR DECLSPEC_HIDDEN nfd_table[6075] =
     0x05ea, 0x05bc, 0x05d5, 0x05b9, 0x05d1, 0x05bf, 0x05db, 0x05bf,
     0x05e4, 0x05bf
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/tools/make_unicode b/tools/make_unicode
index 312b2a7627..445ab68a9d 100755
--- a/tools/make_unicode
+++ b/tools/make_unicode
@@ -2355,10 +2355,8 @@ chdir ".." if -f "./make_unicode";
 load_data();
 dump_case_mappings( "libs/port/casemap.c" );
 dump_sortkeys( "dlls/kernelbase/collation.c" );
-dump_compose_table( "libs/port/compose.c" );
 dump_compose_table( "dlls/ntdll/compose.c" );
 dump_compose_table( "dlls/kernelbase/compose.c" );
-dump_decompose_table( "libs/port/decompose.c", 0 );
 dump_decompose_table( "dlls/ntdll/decompose.c", 1 );
 dump_decompose_table( "dlls/kernelbase/decompose.c", 0 );
 dump_ctype_tables( "libs/port/wctype.c" );