summaryrefslogtreecommitdiffstats
path: root/9/sources/android/support/include/string.h
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2015-01-13 22:17:02 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-01-13 22:17:03 +0000
commit7714ae663f56992505cee31ddc8203f8c99da5a1 (patch)
tree9bcebab2edecf9266c332587fdd56fac8b3836c0 /9/sources/android/support/include/string.h
parent8226f95d450857358fd08319a906c83739bd5035 (diff)
parent45b1d17d3c24e23b0955928e62881e6fd0f7b8c5 (diff)
downloadprebuilts_ndk-7714ae663f56992505cee31ddc8203f8c99da5a1.zip
prebuilts_ndk-7714ae663f56992505cee31ddc8203f8c99da5a1.tar.gz
prebuilts_ndk-7714ae663f56992505cee31ddc8203f8c99da5a1.tar.bz2
Merge "Update llvm-libc++"
Diffstat (limited to '9/sources/android/support/include/string.h')
-rw-r--r--9/sources/android/support/include/string.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/9/sources/android/support/include/string.h b/9/sources/android/support/include/string.h
index d2edd19..732df75 100644
--- a/9/sources/android/support/include/string.h
+++ b/9/sources/android/support/include/string.h
@@ -28,9 +28,10 @@
#ifndef NDK_ANDROID_SUPPORT_STRING_H
#define NDK_ANDROID_SUPPORT_STRING_H
-// __LP64__
-
#include_next <string.h>
+
+#if !defined(__LP64__)
+
#include <xlocale.h>
#ifdef __cplusplus
@@ -44,4 +45,6 @@ size_t strxfrm_l(char *, const char *, size_t, locale_t);
} // extern "C"
#endif
+#endif // !__LP64__
+
#endif // NDK_ANDROID_SUPPORT_STRING_H