[git commit future 1/1] basename.c: define it correctly, use the proper header for each version

[Khem Raj]

commit: http://git.uclibc.org/uClibc/commit/?id=b6cf2bf7397c5c6fe5a9c7e441e2441f3c1f7310
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/future

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
 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 <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 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 <string.h>
 
 #ifdef __USE_GNU
 
-- 
1.7.3.4