Alexandre Julliard : libwine: Move the wide char to multi-byte conversion functions to libwine_port.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Feb 19 08:56:21 CST 2016
Module: wine
Branch: master
Commit: 52333e9c5d735c2be40f17991c84956e98eae896
URL: http://source.winehq.org/git/wine.git/?a=commit;h=52333e9c5d735c2be40f17991c84956e98eae896
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Feb 19 11:43:35 2016 +0900
libwine: Move the wide char to multi-byte conversion functions to libwine_port.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/port/Makefile.in | 5 ++++-
libs/{wine => port}/compose.c | 0
libs/{wine => port}/utf8.c | 0
libs/{wine => port}/wctomb.c | 0
libs/wine/Makefile.in | 3 ---
libs/wine/port.c | 5 ++++-
tools/make_unicode | 2 +-
7 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index 1db8418..9d7e44f 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -73,6 +73,7 @@ C_SRCS = \
c_936.c \
c_949.c \
c_950.c \
+ compose.c \
cpsymbol.c \
cptable.c \
decompose.c \
@@ -101,4 +102,6 @@ C_SRCS = \
strerror.c \
strncasecmp.c \
symlink.c \
- usleep.c
+ usleep.c \
+ utf8.c \
+ wctomb.c
diff --git a/libs/wine/compose.c b/libs/port/compose.c
similarity index 100%
rename from libs/wine/compose.c
rename to libs/port/compose.c
diff --git a/libs/wine/utf8.c b/libs/port/utf8.c
similarity index 100%
rename from libs/wine/utf8.c
rename to libs/port/utf8.c
diff --git a/libs/wine/wctomb.c b/libs/port/wctomb.c
similarity index 100%
rename from libs/wine/wctomb.c
rename to libs/port/wctomb.c
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index baddb8d..4e96b12 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -5,7 +5,6 @@ STATICLIB = libwine_static.a
C_SRCS = \
casemap.c \
collation.c \
- compose.c \
config.c \
debug.c \
ldt.c \
@@ -14,8 +13,6 @@ C_SRCS = \
port.c \
sortkey.c \
string.c \
- utf8.c \
- wctomb.c \
wctype.c
EXTRA_OBJS = version.o
diff --git a/libs/wine/port.c b/libs/wine/port.c
index 53fe6df..e05e166 100644
--- a/libs/wine/port.c
+++ b/libs/wine/port.c
@@ -34,9 +34,12 @@ const void *libwine_port_functions[] =
wine_cp_enum_table,
wine_cp_get_table,
wine_cp_mbstowcs,
+ wine_cp_wcstombs,
wine_cpsymbol_mbstowcs,
wine_cpsymbol_wcstombs,
- wine_fold_string
+ wine_fold_string,
+ wine_utf8_mbstowcs,
+ wine_utf8_wcstombs
};
/* no longer used, for backwards compatibility only */
diff --git a/tools/make_unicode b/tools/make_unicode
index 361eb92..60aeb19 100755
--- a/tools/make_unicode
+++ b/tools/make_unicode
@@ -2465,7 +2465,7 @@ chdir ".." if -f "./make_unicode";
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_compose_table( "libs/port/compose.c" );
dump_decompose_table( "libs/port/decompose.c" );
DUMP_CTYPE_TABLES( "libs/wine/wctype.c" );
dump_digit_folding( "libs/port/digitmap.c" );
More information about the wine-cvs
mailing list