Update.

	* string/basename.c [!_LIBC]: Define function as gnu_basename.

	* posix/getopt.c [!__GNU_LIBRARY__]: Include string.h or
	strings.h.

diff --git a/ChangeLog b/ChangeLog
index 5d0580006c3c736773dafac8850ca48aee69abf6..1c5b262b780aa0190b4f8bc16d886039d8516e74 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1998-04-28  Ulrich Drepper  <drepper@cygnus.com>
 
+       * string/basename.c [!_LIBC]: Define function as gnu_basename.
+
+       * posix/getopt.c [!__GNU_LIBRARY__]: Include string.h or
+       strings.h.
+
        * stdlib/grouping.h: Accept ungrouped numbers even if locale
        defines grouping.
 

diff --git a/posix/getopt.c b/posix/getopt.c
index 4cbf3614cc63e378feca5f75deebb5ddf451d543..4d837c041a65fa6555f5ade6ed755bca91266afc 100644 (file)
--- a/posix/getopt.c
+++ b/posix/getopt.c
@@ -198,15 +198,18 @@ static char *posixly_correct;
 # define my_index      strchr
 #else
 
+# if HAVE_STRING_H
+#  include <string.h>
+# else
+#  include <strings.h>
+# endif
+
 /* Avoid depending on library functions or files
    whose names are inconsistent.  */
 
 #ifndef getenv
 extern char *getenv ();
 #endif
-#ifndef strncmp
-extern int strncmp ();
-#endif
 
 static char *
 my_index (str, chr)

diff --git a/string/basename.c b/string/basename.c
index f24e0ac1b4f4574ce187422fee401c6a97dbc9ba..ce1b4de3da68dc0725a5075a8b8c78bd1acc59d3 100644 (file)
--- 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;