Alexandre Julliard : libwine: Move string functions to libwine_port.
Alexandre Julliard
julliard at winehq.org
Mon Apr 1 16:32:02 CDT 2019
Module: wine
Branch: master
Commit: c3398b7eab645321a7ec489832ca035ca5b94942
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3398b7eab645321a7ec489832ca035ca5b94942
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Mar 27 10:03:38 2019 +0100
libwine: Move string functions to libwine_port.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/port/Makefile.in | 1 +
libs/{wine => port}/string.c | 3 +--
libs/wine/Makefile.in | 3 +--
libs/wine/port.c | 3 +++
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index ef3b23f..18cbf79 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -101,6 +101,7 @@ C_SRCS = \
sortkey.c \
spawn.c \
statvfs.c \
+ string.c \
strnlen.c \
symlink.c \
usleep.c \
diff --git a/libs/wine/string.c b/libs/port/string.c
similarity index 99%
rename from libs/wine/string.c
rename to libs/port/string.c
index 7aa981f..c3388bc 100644
--- a/libs/wine/string.c
+++ b/libs/port/string.c
@@ -23,7 +23,6 @@
#include <limits.h>
#include <stdio.h>
-#define WINE_UNICODE_INLINE /* nothing */
#include "wine/unicode.h"
int strcmpiW( const WCHAR *str1, const WCHAR *str2 )
@@ -473,7 +472,7 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist)
*fmta = '\0';
if (*iter == 'a' || *iter == 'A' ||
*iter == 'e' || *iter == 'E' ||
- *iter == 'f' || *iter == 'F' ||
+ *iter == 'f' || *iter == 'F' ||
*iter == 'g' || *iter == 'G')
sprintf(bufaiter, fmtbufa, va_arg(valist, double));
else
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index bd8a937..6525a53 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -6,8 +6,7 @@ C_SRCS = \
ldt.c \
loader.c \
mmap.c \
- port.c \
- string.c
+ port.c
EXTRA_OBJS = version.o
diff --git a/libs/wine/port.c b/libs/wine/port.c
index 666c4ca..e954e5b 100644
--- a/libs/wine/port.c
+++ b/libs/wine/port.c
@@ -25,6 +25,7 @@
#include <string.h>
#include <sys/types.h>
+#define WINE_UNICODE_INLINE /* nothing */
#include "wine/unicode.h"
#include "wine/library.h"
@@ -33,6 +34,8 @@
#ifndef __ANDROID__
const void *libwine_port_functions[] =
{
+ strtolW,
+ vsnprintfW,
wine_compare_string,
wine_cp_enum_table,
wine_cp_get_table,
More information about the wine-cvs
mailing list