summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2011-03-21 15:34:26 +0100
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2012-06-15 14:00:30 +0200
commit32506112b43148bfed763c0f96399d995aa07203 (patch)
tree9c604e65690398e669316fe9e9aec7a8944150f9
parent7431f726e2865028c98abc9ea765069fcfe4bc63 (diff)
basename.c: define it correctly, use the proper header for each version
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-rw-r--r--libc/string/__xpg_basename.c5
-rw-r--r--libc/string/basename.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/libc/string/__xpg_basename.c b/libc/string/__xpg_basename.c
index 2449d1d42..2e7ade913 100644
--- a/libc/string/__xpg_basename.c
+++ b/libc/string/__xpg_basename.c
@@ -5,7 +5,6 @@
* Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
*/
-#include "_string.h"
#include <libgen.h>
char *__xpg_basename(register char *path)
@@ -34,3 +33,7 @@ char *__xpg_basename(register char *path)
return first;
}
+#ifndef __USE_GNU
+# undef basename
+weak_alias(__xpg_basename,basename)
+#endif
diff --git a/libc/string/basename.c b/libc/string/basename.c
index 58c45be18..abc9d89db 100644
--- a/libc/string/basename.c
+++ b/libc/string/basename.c
@@ -5,7 +5,7 @@
* Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
*/
-#include "_string.h"
+#include <string.h>
#ifdef __USE_GNU