Alexandre Julliard : libwine: Move the multi-byte to wide char conversion functions to libwine_port.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f7368aaa97002759676a0f9b8c3806f62a55f6bd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f7368aaa97002759676a0f9b8c...

Author: Alexandre Julliard 
Date:   Fri Feb 19 11:41:44 2016 +0900

libwine: Move the multi-byte to wide char conversion functions to libwine_port.

Signed-off-by: Alexandre Julliard

---

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

diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index 67fb999..1db8418 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -75,6 +75,7 @@ C_SRCS = \
    c_950.c \
    cpsymbol.c \
    cptable.c \
+	decompose.c \
    digitmap.c \
    ffs.c \
    fold.c \
@@ -86,6 +87,7 @@ C_SRCS = \
    isinf.c \
    isnan.c \
    lstat.c \
+	mbtowc.c \
    memcpy_unaligned.c \
    memmove.c \
    mkstemps.c \
diff --git a/libs/wine/decompose.c b/libs/port/decompose.c
similarity index 100%
rename from libs/wine/decompose.c
rename to libs/port/decompose.c
diff --git a/libs/wine/mbtowc.c b/libs/port/mbtowc.c
similarity index 100%
rename from libs/wine/mbtowc.c
rename to libs/port/mbtowc.c
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index b2b250e..baddb8d 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -8,10 +8,8 @@ C_SRCS = \
    compose.c \
    config.c \
    debug.c \
-	decompose.c \
    ldt.c \
    loader.c \
-	mbtowc.c \
    mmap.c \
    port.c \
    sortkey.c \
diff --git a/libs/wine/port.c b/libs/wine/port.c
index 070dfd9..53fe6df 100644
--- a/libs/wine/port.c
+++ b/libs/wine/port.c
@@ -33,6 +33,7 @@ const void *libwine_port_functions[] =
 {
     wine_cp_enum_table,
     wine_cp_get_table,
+    wine_cp_mbstowcs,
     wine_cpsymbol_mbstowcs,
     wine_cpsymbol_wcstombs,
     wine_fold_string
diff --git a/tools/make_unicode b/tools/make_unicode
index de008fc..361eb92 100755
--- a/tools/make_unicode
+++ b/tools/make_unicode
@@ -2466,7 +2466,7 @@ READ_DEFAULTS( $DEFAULTS );
 DUMP_CASE_MAPPINGS( "libs/wine/casemap.c" );
 DUMP_SORTKEYS( "libs/wine/collation.c", READ_SORTKEYS_FILE() );
 dump_compose_table( "libs/wine/compose.c" );
-dump_decompose_table( "libs/wine/decompose.c" );
+dump_decompose_table( "libs/port/decompose.c" );
 DUMP_CTYPE_TABLES( "libs/wine/wctype.c" );
 dump_digit_folding( "libs/port/digitmap.c" );
 dump_mirroring( "dlls/usp10/mirror.c" );