From 16d9ba808b64a2af8a10b5710bea7c4b63e989db Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Fri, 30 Jun 2017 13:20:28 -0700 Subject: [PATCH] Add version info for C++ versions of basename, strchrnul. These still won't get guards added by the preprocessor, because it compiles with C-only. Bug: https://github.com/android-ndk/ndk/issues/440 Test: treehugger Change-Id: I893b345e528ed1b761e0db00700037411bbb8b78 --- libc/include/string.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libc/include/string.h b/libc/include/string.h index c178a3c70ee..c15fe4acb60 100644 --- a/libc/include/string.h +++ b/libc/include/string.h @@ -67,8 +67,8 @@ char* strchr(const char* _Nonnull, int) __attribute_pure__ __overloadable char* __strchr_chk(const char* _Nonnull, int, size_t) __INTRODUCED_IN(18); #if defined(__USE_GNU) #if defined(__cplusplus) -extern "C++" char* strchrnul(char* _Nonnull, int) __RENAME(strchrnul) __attribute_pure__; -extern "C++" const char* strchrnul(const char* _Nonnull, int) __RENAME(strchrnul) __attribute_pure__; +extern "C++" char* strchrnul(char* _Nonnull, int) __RENAME(strchrnul) __attribute_pure__ __INTRODUCED_IN(24); +extern "C++" const char* strchrnul(const char* _Nonnull, int) __RENAME(strchrnul) __attribute_pure__ __INTRODUCED_IN(24); #else char* strchrnul(const char* _Nonnull, int) __attribute_pure__ __INTRODUCED_IN(24); #endif @@ -142,8 +142,8 @@ size_t strxfrm_l(char* __restrict, const char* _Nonnull __restrict, size_t, loca * It doesn't modify its argument, and in C++ it's const-correct. */ #if defined(__cplusplus) -extern "C++" char* basename(char* _Nonnull) __RENAME(__gnu_basename); -extern "C++" const char* basename(const char* _Nonnull) __RENAME(__gnu_basename); +extern "C++" char* basename(char* _Nonnull) __RENAME(__gnu_basename) __INTRODUCED_IN(23); +extern "C++" const char* basename(const char* _Nonnull) __RENAME(__gnu_basename) __INTRODUCED_IN(23); #else char* basename(const char* _Nonnull) __RENAME(__gnu_basename) __INTRODUCED_IN(23); #endif