X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fbasename.c;h=a47b200e5fc55c016414f708c77d5764693b3eef;hb=9399ec2583eedf5a9f9b76baae196d613d6035d7;hp=b8e7e1f4f167f3714fdc674ed9d3ce14fd402875;hpb=43e78b970f396160a887c9da94531569faeda8a0;p=gnulib.git

diff --git a/lib/basename.c b/lib/basename.c
index b8e7e1f4f..a47b200e5 100644
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -15,21 +15,27 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#if defined(USG) || defined(STDC_HEADERS)
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
 #include <string.h>
-#define rindex strrchr
 #else
 #include <strings.h>
+#ifndef strrchr
+#define strrchr rindex
+#endif
 #endif
 
 /* Return NAME with any leading path stripped off.  */
 
 char *
 basename (name)
-     char *name;
+     const char *name;
 {
   char *base;
 
-  base = rindex (name, '/');
-  return base ? base + 1 : name;
+  base = strrchr (name, '/');
+  return base ? base + 1 : (char *) name;
 }