From 11bc30adf5cc93563667d4d7edce0a7293239c0c Mon Sep 17 00:00:00 2001 From: Peter S. Mazinger Date: Mon, 21 Mar 2011 15:34:26 +0100 Subject: [PATCH 149/396] basename.c: define it correctly, use the proper header for each version Signed-off-by: Peter S. Mazinger --- libc/string/__xpg_basename.c | 5 ++++- libc/string/basename.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libc/string/__xpg_basename.c b/libc/string/__xpg_basename.c index 2449d1d..2e7ade9 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 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 58c45be..abc9d89 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 #ifdef __USE_GNU -- 1.7.0.4