Update.

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

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

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.
 

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)

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;