From cf5fc80c3eb710cb5a1985837156cb2758c87a5b Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 5 Sep 2014 16:12:42 -0700 Subject: Don't expose non-standard basename_r and dirname_r in LP64. (cherry-pick of f0e9458ea596227720fa745df15f5357f6c0c8f6.) Bug: 17407423 Change-Id: I47fe499a4c396bf09d7b78fd828728d04777398b --- tests/libgen_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/libgen_test.cpp b/tests/libgen_test.cpp index d0402dbf6..e9a5d5c44 100644 --- a/tests/libgen_test.cpp +++ b/tests/libgen_test.cpp @@ -63,7 +63,7 @@ TEST(libgen, dirname) { TestDirname("/", "/"); } -#if defined(__BIONIC__) +#if defined(__BIONIC__) && !defined(__LP64__) static void TestBasename(const char* in, const char* expected_out, int expected_rc, char* buf, size_t buf_size, int expected_errno) { errno = 0; @@ -88,7 +88,7 @@ static void TestDirname(const char* in, const char* expected_out, int expected_r #endif // __BIONIC__ TEST(libgen, basename_r) { -#if defined(__BIONIC__) +#if defined(__BIONIC__) && !defined(__LP64__) char buf[256]; TestBasename("", ".", 1, NULL, 0, 0); TestBasename("", ".", -1, buf, 0, ERANGE); @@ -107,7 +107,7 @@ TEST(libgen, basename_r) { } TEST(libgen, dirname_r) { -#if defined(__BIONIC__) +#if defined(__BIONIC__) && !defined(__LP64__) char buf[256]; TestDirname("", ".", 1, NULL, 0, 0); TestDirname("", ".", -1, buf, 0, ERANGE); -- cgit v1.2.3