aboutsummaryrefslogtreecommitdiff
path: root/newlib/libc/include/string.h
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowi@redhat.com>2015-07-06 14:58:51 -0500
committerYaakov Selkowitz <yselkowi@redhat.com>2015-07-06 14:58:51 -0500
commit79e419de6261c4e04785908828096cb4d56b8680 (patch)
tree72f17165f0acb9ad42eb45c801acfd7624570c5c /newlib/libc/include/string.h
parentf9b87aaf109366342777521fe93fe9f795e8f1fa (diff)
downloadnewlib-79e419de6261c4e04785908828096cb4d56b8680.zip
newlib-79e419de6261c4e04785908828096cb4d56b8680.tar.gz
newlib-79e419de6261c4e04785908828096cb4d56b8680.tar.bz2
Rework handling of basename variants
As a commonly-included header, the #define basename in <string.h> can affect code which uses "basename" for its own purposes (e.g. struct members or C++ namespaced functions). When such cases occur and some code includes <string.h> and some not, then errors result. OTOH, <libgen.h> is rarely used, and that's where the renaming occurs in glibc, so code using <libgen.h> should already be safe. * libc/include/libgen.h (basename): Define as __xpg_basename for source compatibility with glibc. Declare with __ASMNAME("basename") for ABI compatibility. * libc/include/string.h (basename): Define as basename for source compatibility with glibc. Declare with __ASMNAME("__gnu_basename") for ABI compatibility.
Diffstat (limited to 'newlib/libc/include/string.h')
-rw-r--r--newlib/libc/include/string.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h
index 92e08ae..84dd6b0 100644
--- a/newlib/libc/include/string.h
+++ b/newlib/libc/include/string.h
@@ -175,8 +175,8 @@ int _EXFUN(strtosigno, (const char *__name));
this also implies that the POSIX version is used in this case. That's made
sure here. */
#if __GNU_VISIBLE && !defined(basename)
-char *_EXFUN(__nonnull (1) __gnu_basename,(const char *));
-# define basename __gnu_basename
+# define basename basename
+char *_EXFUN(__nonnull (1) basename,(const char *)) __asm__(__ASMNAME("__gnu_basename"));
#endif
#include <sys/string.h>