From a02b23e4181eb4539db9f60ed5601e609dd9476c Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 29 Mar 2019 21:07:59 +0100
Subject: [PATCH] Revert "libwine: Move string functions to libwine_port."

This reverts commit 47242d25f5b2964c9a61956345d1fe0ad39b96d2.
It breaks in modules that import msvcrt because it uses libc
functions.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 libs/port/Makefile.in        | 1 -
 libs/wine/Makefile.in        | 3 ++-
 libs/wine/port.c             | 3 ---
 libs/{port => wine}/string.c | 3 ++-
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename libs/{port => wine}/string.c (99%)

diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index 18cbf79ff08..ef3b23feb33 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -101,7 +101,6 @@ C_SRCS = \
 	sortkey.c \
 	spawn.c \
 	statvfs.c \
-	string.c \
 	strnlen.c \
 	symlink.c \
 	usleep.c \
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index 6525a53c6f5..bd8a9378bb8 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -6,7 +6,8 @@ C_SRCS = \
 	ldt.c \
 	loader.c \
 	mmap.c \
-	port.c
+	port.c \
+	string.c
 
 EXTRA_OBJS = version.o
 
diff --git a/libs/wine/port.c b/libs/wine/port.c
index e954e5ba8e5..666c4cab0c6 100644
--- a/libs/wine/port.c
+++ b/libs/wine/port.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <sys/types.h>
 
-#define WINE_UNICODE_INLINE  /* nothing */
 #include "wine/unicode.h"
 #include "wine/library.h"
 
@@ -34,8 +33,6 @@
 #ifndef __ANDROID__
 const void *libwine_port_functions[] =
 {
-    strtolW,
-    vsnprintfW,
     wine_compare_string,
     wine_cp_enum_table,
     wine_cp_get_table,
diff --git a/libs/port/string.c b/libs/wine/string.c
similarity index 99%
rename from libs/port/string.c
rename to libs/wine/string.c
index c3388bcc7da..7aa981f0a62 100644
--- a/libs/port/string.c
+++ b/libs/wine/string.c
@@ -23,6 +23,7 @@
 #include <limits.h>
 #include <stdio.h>
 
+#define WINE_UNICODE_INLINE  /* nothing */
 #include "wine/unicode.h"
 
 int strcmpiW( const WCHAR *str1, const WCHAR *str2 )
@@ -472,7 +473,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