diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-18 12:07:00 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-18 12:07:00 +0100 |
| commit | 385816ce486622d72a8e56443b53ff8404d4ae3b (patch) | |
| tree | eda6b439a633bda0fed55b9753ca9b035dc7c04d /libc/include/string.h | |
| parent | d103a5984a13da8a540dd760e8682b6ac257e263 (diff) | |
| parent | f6164e6c266759ab0cd9e7e491326d3c0974dfbd (diff) | |
| download | bionic-4817df04ac3c88073aec4e0b710497f99a6e6930.zip bionic-4817df04ac3c88073aec4e0b710497f99a6e6930.tar.gz bionic-4817df04ac3c88073aec4e0b710497f99a6e6930.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_bionic into replicant-6.0replicant-6.0-alpha-0005replicant-6.0-alpha-0004
Diffstat (limited to 'libc/include/string.h')
| -rw-r--r-- | libc/include/string.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/include/string.h b/libc/include/string.h index d32c164..8ceccd5 100644 --- a/libc/include/string.h +++ b/libc/include/string.h @@ -107,18 +107,18 @@ extern size_t strxfrm(char* __restrict, const char* __restrict, size_t); extern int strcoll_l(const char *, const char *, locale_t) __purefunc; extern size_t strxfrm_l(char* __restrict, const char* __restrict, size_t, locale_t); -#if defined(__USE_GNU) && !defined(__bionic_using_posix_basename) +#if defined(__USE_GNU) && !defined(basename) /* * glibc has a basename in <string.h> that's different to the POSIX one in <libgen.h>. * It doesn't modify its argument, and in C++ it's const-correct. */ + #if defined(__cplusplus) extern "C++" char* basename(char*) __RENAME(__gnu_basename) __nonnull((1)); extern "C++" const char* basename(const char*) __RENAME(__gnu_basename) __nonnull((1)); #else extern char* basename(const char*) __RENAME(__gnu_basename) __nonnull((1)); #endif -#define __bionic_using_gnu_basename #endif extern void* __memchr_chk(const void*, int, size_t, size_t); |