Skip to content
Snippets Groups Projects
Commit a02b23e4 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files

Revert "libwine: Move string functions to libwine_port."


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

Signed-off-by: Alexandre Julliard's avatarAlexandre Julliard <julliard@winehq.org>
parent bd678b0b
No related branches found
No related tags found
No related merge requests found
...@@ -101,7 +101,6 @@ C_SRCS = \ ...@@ -101,7 +101,6 @@ C_SRCS = \
sortkey.c \ sortkey.c \
spawn.c \ spawn.c \
statvfs.c \ statvfs.c \
string.c \
strnlen.c \ strnlen.c \
symlink.c \ symlink.c \
usleep.c \ usleep.c \
......
...@@ -6,7 +6,8 @@ C_SRCS = \ ...@@ -6,7 +6,8 @@ C_SRCS = \
ldt.c \ ldt.c \
loader.c \ loader.c \
mmap.c \ mmap.c \
port.c port.c \
string.c
EXTRA_OBJS = version.o EXTRA_OBJS = version.o
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#define WINE_UNICODE_INLINE /* nothing */
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/library.h" #include "wine/library.h"
...@@ -34,8 +33,6 @@ ...@@ -34,8 +33,6 @@
#ifndef __ANDROID__ #ifndef __ANDROID__
const void *libwine_port_functions[] = const void *libwine_port_functions[] =
{ {
strtolW,
vsnprintfW,
wine_compare_string, wine_compare_string,
wine_cp_enum_table, wine_cp_enum_table,
wine_cp_get_table, wine_cp_get_table,
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <limits.h> #include <limits.h>
#include <stdio.h> #include <stdio.h>
#define WINE_UNICODE_INLINE /* nothing */
#include "wine/unicode.h" #include "wine/unicode.h"
int strcmpiW( const WCHAR *str1, const WCHAR *str2 ) 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) ...@@ -472,7 +473,7 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist)
*fmta = '\0'; *fmta = '\0';
if (*iter == 'a' || *iter == 'A' || if (*iter == 'a' || *iter == 'A' ||
*iter == 'e' || *iter == 'E' || *iter == 'e' || *iter == 'E' ||
*iter == 'f' || *iter == 'F' || *iter == 'f' || *iter == 'F' ||
*iter == 'g' || *iter == 'G') *iter == 'g' || *iter == 'G')
sprintf(bufaiter, fmtbufa, va_arg(valist, double)); sprintf(bufaiter, fmtbufa, va_arg(valist, double));
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment