tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Removes wcswcs from bionic for LP64."

Browse source
This commit is contained in:
Dan Albert 2014-06-04 20:59:10 +00:00 committed by Gerrit Code Review
commit 623dce3bd4
5 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libc/Android.mk
View file

@ -481,7 +481,6 @@ libc_upstream_openbsd_src_files := \
upstream-openbsd/lib/libc/string/strtok.c \
upstream-openbsd/lib/libc/string/wcslcpy.c \
upstream-openbsd/lib/libc/string/wcsstr.c \
upstream-openbsd/lib/libc/string/wcswcs.c \
upstream-openbsd/lib/libc/string/wcswidth.c \
libc_arch_static_src_files := \

5
libc/bionic/ndk_cruft.cpp
View file

@ -40,6 +40,7 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
#include <wchar.h>
// These were accidentally declared in <unistd.h> because we stupidly used to inline
// getpagesize() and __getpageshift(). Needed for backwards compatibility with old NDK apps.
@ -221,4 +222,8 @@ extern "C" int tkill(pid_t tid, int sig) {
return syscall(__NR_tkill, tid, sig);
}
extern "C" wchar_t* wcswcs(wchar_t* haystack, wchar_t* needle) {
return wcsstr(haystack, needle);
}
#endif

1
libc/include/wchar.h
View file

@ -138,7 +138,6 @@ extern long long wcstoll(const wchar_t*, wchar_t**, int);
extern long double wcstold(const wchar_t*, wchar_t**);
extern unsigned long wcstoul(const wchar_t*, wchar_t**, int);
extern unsigned long long wcstoull(const wchar_t*, wchar_t**, int);
extern wchar_t *wcswcs(const wchar_t *, const wchar_t *);
extern int wcswidth(const wchar_t *, size_t);
extern size_t wcsxfrm(wchar_t *, const wchar_t *, size_t);
extern int wctob(wint_t);

5
libc/upstream-openbsd/lib/libc/string/wcswcs.c
View file

@ -1,5 +0,0 @@
/* $OpenBSD: wcswcs.c,v 1.1 2005/04/13 16:35:58 espie Exp $ */
/* $NetBSD: wcswcs.c,v 1.1 2003/03/05 20:18:17 tshiozak Exp $ */
#define WCSWCS
#include "wcsstr.c"

6
tests/wchar_test.cpp
View file

@ -221,7 +221,7 @@ TEST(wchar, limits) {
ASSERT_LT(WCHAR_MIN, WCHAR_MAX);
}
TEST(wchar, wcsstr_wcswcs) {
TEST(wchar, wcsstr) {
const wchar_t* haystack = L"matches hello world, not the second hello world";
const wchar_t* empty_needle = L"";
const wchar_t* good_needle = L"ll";
@ -230,10 +230,6 @@ TEST(wchar, wcsstr_wcswcs) {
ASSERT_EQ(haystack, wcsstr(haystack, empty_needle));
ASSERT_EQ(&haystack[10], wcsstr(haystack, good_needle));
ASSERT_EQ(NULL, wcsstr(haystack, bad_needle));
ASSERT_EQ(haystack, wcswcs(haystack, empty_needle));
ASSERT_EQ(&haystack[10], wcswcs(haystack, good_needle));
ASSERT_EQ(NULL, wcswcs(haystack, bad_needle));
}
TEST(wchar, mbtowc) {