commit f0e9458ea596227720fa745df15f5357f6c0c8f6
author Elliott Hughes <enh@google.com> Fri Sep 05 16:12:42 2014 -0700
committer Elliott Hughes <enh@google.com> Fri Sep 05 16:12:42 2014 -0700
tree 5e544cbf962cd1264d9670ca03563e18d12f4bef
parent 5beddb7d642524ecb6655ab2823caf2add679917

Don't expose non-standard basename_r and dirname_r in LP64.

Bug: 17407423
Change-Id: I47fe499a4c396bf09d7b78fd828728d04777398b

tests/libgen_test.cpp

diff --git a/tests/libgen_test.cpp b/tests/libgen_test.cpp
index cae646f..3958f81 100644
--- a/tests/libgen_test.cpp
+++ b/tests/libgen_test.cpp
@@ -64,7 +64,7 @@
   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;
@@ -89,7 +89,7 @@
 #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);
@@ -108,7 +108,7 @@
 }
 
 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);