commit cf5fc80c3eb710cb5a1985837156cb2758c87a5b
author Elliott Hughes <enh@google.com> Fri Sep 05 16:12:42 2014 -0700
committer Elliott Hughes <enh@google.com> Mon Sep 08 16:44:48 2014 -0700
tree 15682b74fd20e0a37c8d6cef63bba9e05df7145f
parent d3d89f0d28aba2db9f11cc0a9b3a865fa1d9d265

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

diff --git a/tests/libgen_test.cpp b/tests/libgen_test.cpp
index d0402db..e9a5d5c 100644
--- a/tests/libgen_test.cpp
+++ b/tests/libgen_test.cpp
@@ -63,7 +63,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;
@@ -88,7 +88,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);
@@ -107,7 +107,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);