--- coreutils-5.2.1/src/tee.c.vanilla	2006-06-13 13:26:40.460000000 +0200
+++ coreutils-5.2.1/src/tee.c	2006-06-13 13:30:20.260000000 +0200
@@ -31,7 +31,7 @@
 
 #define AUTHORS "Mike Parker", "Richard M. Stallman", "David MacKenzie"
 
-static int tee (int nfiles, const char **files);
+static int _tee (int nfiles, const char **files);
 
 /* If nonzero, append to output files rather than truncating them. */
 static int append;
@@ -146,7 +146,7 @@
   /* Do *not* warn if tee is given no file arguments.
      POSIX requires that it work when given no arguments.  */
 
-  errs = tee (argc - optind, (const char **) &argv[optind]);
+  errs = _tee (argc - optind, (const char **) &argv[optind]);
   if (close (STDIN_FILENO) != 0)
     error (EXIT_FAILURE, errno, _("standard input"));
 
@@ -158,7 +158,7 @@
    Return 0 if successful, 1 if any errors occur. */
 
 static int
-tee (int nfiles, const char **files)
+_tee (int nfiles, const char **files)
 {
   FILE **descriptors;
   char buffer[BUFSIZ];
--- coreutils-5.2.1/src/test.c.vanilla	2006-06-13 13:13:54.830000000 +0200
+++ coreutils-5.2.1/src/test.c	2006-06-13 13:16:13.630000000 +0200
@@ -125,7 +125,7 @@
 /* Do the same thing access(2) does, but use the effective uid and gid.  */
 
 static int
-eaccess (char const *file, int mode)
+eaccess2 (char const *file, int mode)
 {
   static int have_ids;
   static uid_t uid, euid;
@@ -158,7 +158,7 @@
   return result;
 }
 #else
-# define eaccess(F, M) euidaccess (F, M)
+# define eaccess2(F, M) euidaccess (F, M)
 #endif
 
 /* Increment our position in the argument list.  Check that we're not
@@ -623,17 +623,17 @@
 
     case 'r':			/* file is readable? */
       unary_advance ();
-      value = -1 != eaccess (argv[pos - 1], R_OK);
+      value = -1 != eaccess2 (argv[pos - 1], R_OK);
       return (TRUE == value);
 
     case 'w':			/* File is writable? */
       unary_advance ();
-      value = -1 != eaccess (argv[pos - 1], W_OK);
+      value = -1 != eaccess2 (argv[pos - 1], W_OK);
       return (TRUE == value);
 
     case 'x':			/* File is executable? */
       unary_advance ();
-      value = -1 != eaccess (argv[pos - 1], X_OK);
+      value = -1 != eaccess2 (argv[pos - 1], X_OK);
       return (TRUE == value);
 
     case 'O':			/* File is owned by you? */