From 47242d25f5b2964c9a61956345d1fe0ad39b96d2 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Wed, 27 Mar 2019 10:03:38 +0100
Subject: [PATCH] libwine: Move string functions to libwine_port.

Signed-off-by: Alexandre Julliard <julliard@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(-)
 rename libs/{wine => port}/string.c (99%)

diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index ef3b23feb33..18cbf79ff08 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 7aa981f0a62..c3388bcc7da 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 bd8a9378bb8..6525a53c6f5 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 666c4cab0c6..e954e5ba8e5 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,