--- ccache.c.bak	2003-02-17 02:11:58.000000000 +0100
+++ ccache.c	2003-08-26 12:01:21.000000000 +0200
@@ -491,7 +491,7 @@
 
 	orig_args = args_init(argc, argv);
 
-	base = basename(argv[0]);
+	base = x_basename(argv[0]);
 
 	/* we might be being invoked like "ccache gcc -c foo.c" */
 	if (strcmp(base, MYNAME) == 0) {
@@ -501,7 +501,7 @@
 			/* a full path was given */
 			return;
 		}
-		base = basename(argv[1]);
+		base = x_basename(argv[1]);
 	}
 
 	/* support user override of the compiler */
--- ccache.h.bak	2003-02-17 02:11:58.000000000 +0100
+++ ccache.h	2003-08-26 12:04:05.000000000 +0200
@@ -83,7 +83,7 @@
 void *x_realloc(void *ptr, size_t size);
 void *x_malloc(size_t size);
 void traverse(const char *dir, void (*fn)(const char *, struct stat *));
-char *basename(const char *s);
+char *x_basename(const char *s);
 char *dirname(char *s);
 int lock_fd(int fd);
 size_t file_size(struct stat *st);
--- cleanup.c.bak	2003-01-07 06:40:23.000000000 +0100
+++ cleanup.c	2003-08-26 12:01:37.000000000 +0200
@@ -52,7 +52,7 @@
 
 	if (!S_ISREG(st->st_mode)) return;
 
-	p = basename(fname);
+	p = x_basename(fname);
 	if (strcmp(p, "stats") == 0) {
 		free(p);
 		return;
@@ -165,7 +165,7 @@
 
 	if (!S_ISREG(st->st_mode)) return;
 
-	p = basename(fname);
+	p = x_basename(fname);
 	if (strcmp(p, "stats") == 0) {
 		free(p);
 		return;
--- execute.c.bak	2003-02-17 02:11:58.000000000 +0100
+++ execute.c	2003-08-26 12:01:46.000000000 +0200
@@ -102,7 +102,7 @@
 			if (S_ISLNK(st1.st_mode)) {
 				char *buf = x_realpath(fname);
 				if (buf) {
-					char *p = basename(buf);
+					char *p = x_basename(buf);
 					if (strcmp(p, exclude_name) == 0) {
 						/* its a link to "ccache" ! */
 						free(p);
--- util.c.bak	2003-01-07 07:31:02.000000000 +0100
+++ util.c	2003-08-26 12:01:57.000000000 +0200
@@ -242,7 +242,7 @@
 
 
 /* return the base name of a file - caller frees */
-char *basename(const char *s)
+char *x_basename(const char *s)
 {
 	char *p = strrchr(s, '/');
 	if (p) {