Revert "libwine: Move string functions to libwine_port."

libs/port/Makefile.in

@@ -101,7 +101,6 @@ C_SRCS = \
 	sortkey.c \
 	spawn.c \
 	statvfs.c \
-	string.c \
 	strnlen.c \
 	symlink.c \
 	usleep.c \

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
 

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,

libs/port/string.c → 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