X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsame.c;h=f018c62b6b33d7b8dd35c53b402e13a6977b92aa;hb=f53990f35803666791f4163e0f9d206bd8c4690e;hp=aa1a2318fc44250c879c38a0759e53d9c6709730;hpb=6ba1261f9596af6a08bbf270e1c18e8ec90be021;p=gnulib.git

diff --git a/lib/same.c b/lib/same.c
index aa1a2318f..f018c62b6 100644
--- a/lib/same.c
+++ b/lib/same.c
@@ -1,5 +1,7 @@
 /* Determine whether two file names refer to the same file.
-   Copyright (C) 1997-2000, 2002-2003 Free Software Foundation, Inc.
+
+   Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -31,9 +33,6 @@
 #include <sys/stat.h>
 #include <ctype.h>
 #include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
 
 #include <string.h>
 
@@ -47,7 +46,9 @@ extern int errno;
 #include "error.h"
 #include "xalloc.h"
 
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#ifndef MIN
+# define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
 
 #define SAME_INODE(Stat_buf_1, Stat_buf_2) \
   ((Stat_buf_1).st_ino == (Stat_buf_2).st_ino \
@@ -56,7 +57,7 @@ extern int errno;
 /* Return nonzero if SOURCE and DEST point to the same name in the same
    directory.  */
 
-int
+bool
 same_name (const char *source, const char *dest)
 {
   /* Compare the basenames.  */