summary refs log tree commit diff
path: root/string
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-04-28 19:41:51 +0000
committerUlrich Drepper <drepper@redhat.com>1998-04-28 19:41:51 +0000
commit5b155773ee9c869d926e35039c244bbdfc249384 (patch)
tree8625e62eacebf723e8d8314ebf8bf6e76a18fea5 /string
parent733bb62a1e04206c836cf47df1c237421df98c5f (diff)
downloadglibc-5b155773ee9c869d926e35039c244bbdfc249384.tar.gz
glibc-5b155773ee9c869d926e35039c244bbdfc249384.tar.xz
glibc-5b155773ee9c869d926e35039c244bbdfc249384.zip
Update.
	* string/basename.c [!_LIBC]: Define function as gnu_basename.

	* posix/getopt.c [!__GNU_LIBRARY__]: Include string.h or
	strings.h.
Diffstat (limited to 'string')
-rw-r--r--string/basename.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/string/basename.c b/string/basename.c
index f24e0ac1b4..ce1b4de3da 100644
--- a/string/basename.c
+++ b/string/basename.c
@@ -1,5 +1,5 @@
 /* Return the name-within-directory of a file name.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,6 +23,13 @@
 
 #include <string.h>
 
+#ifndef _LIBC
+/* We cannot generally use the name `basename' since XPG defines an unusable
+   variant of the function but we cannot use it.  */
+# define basename gnu_basename
+#endif
+
+
 char *
 basename (filename)
      const char *filename;