summary refs log tree commit diff
path: root/io
diff options
context:
space:
mode:
Diffstat (limited to 'io')
-rw-r--r--io/fstat.c3
-rw-r--r--io/fstat64.c1
-rw-r--r--io/fts.c2
-rw-r--r--io/ftw.c2
-rw-r--r--io/ftwtest-sh3
-rw-r--r--io/getdirname.c2
-rw-r--r--io/lstat.c3
-rw-r--r--io/lstat64.c1
-rw-r--r--io/stat.c3
-rw-r--r--io/stat64.c1
10 files changed, 13 insertions, 8 deletions
diff --git a/io/fstat.c b/io/fstat.c
index df558daa58..45e60d6b32 100644
--- a/io/fstat.c
+++ b/io/fstat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997 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
@@ -36,6 +36,7 @@
    functions in the shared library can adapt without needing to recompile
    all callers.  */
 
+#undef fstat
 int
 __fstat (int fd, struct stat *buf)
 {
diff --git a/io/fstat64.c b/io/fstat64.c
index 376a262a10..2d677a15ed 100644
--- a/io/fstat64.c
+++ b/io/fstat64.c
@@ -36,6 +36,7 @@
    functions in the shared library can adapt without needing to recompile
    all callers.  */
 
+#undef fstat64
 int
 fstat64 (int fd, struct stat64 *buf)
 {
diff --git a/io/fts.c b/io/fts.c
index 255c53f529..2ddb295c03 100644
--- a/io/fts.c
+++ b/io/fts.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)fts.c	8.2 (Berkeley) 1/2/94";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
-#include <sys/stat.h>
+#include <include/sys/stat.h>
 #include <fcntl.h>
 #include <dirent.h>
 #include <errno.h>
diff --git a/io/ftw.c b/io/ftw.c
index a7b537f446..b8c82fa969 100644
--- a/io/ftw.c
+++ b/io/ftw.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/param.h>
-#include <sys/stat.h>
+#include <include/sys/stat.h>
 
 /* #define NDEBUG 1 */
 #include <assert.h>
diff --git a/io/ftwtest-sh b/io/ftwtest-sh
index 508c850d4b..0ae6ecd51a 100644
--- a/io/ftwtest-sh
+++ b/io/ftwtest-sh
@@ -108,8 +108,7 @@ LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir $tmpdir |
     sort > $testout
 
 # perhaps $tmp involves some symlinks...
-pwdprogram=`which pwd`
-tmpreal=`( cd $tmp ; $pwdprogram )`
+tmpreal=`cd $tmp; /bin/pwd 2>/dev/null || /usr/bin/pwd`
 
 cat <<EOF | cmp $testout - || exit 1
 base = "$tmp/", file = "ftwtest.d", flag = FTW_D, cwd = $tmpreal, level = 0
diff --git a/io/getdirname.c b/io/getdirname.c
index 6823fafcb2..cc6dd9545c 100644
--- a/io/getdirname.c
+++ b/io/getdirname.c
@@ -17,7 +17,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <unistd.h>
-#include <sys/stat.h>
+#include <include/sys/stat.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/io/lstat.c b/io/lstat.c
index 9510eac237..7ad7b90d4c 100644
--- a/io/lstat.c
+++ b/io/lstat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997 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
@@ -36,6 +36,7 @@
    functions in the shared library can adapt without needing to recompile
    all callers.  */
 
+#undef lstat
 int
 __lstat (const char *file, struct stat *buf)
 {
diff --git a/io/lstat64.c b/io/lstat64.c
index ef2b156917..079b3fa28a 100644
--- a/io/lstat64.c
+++ b/io/lstat64.c
@@ -36,6 +36,7 @@
    functions in the shared library can adapt without needing to recompile
    all callers.  */
 
+#undef lstat64
 int
 lstat64 (const char *file, struct stat64 *buf)
 {
diff --git a/io/stat.c b/io/stat.c
index c4d1f53257..b3631e32c7 100644
--- a/io/stat.c
+++ b/io/stat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997 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
@@ -36,6 +36,7 @@
    functions in the shared library can adapt without needing to recompile
    all callers.  */
 
+#undef stat
 int
 __stat (const char *file, struct stat *buf)
 {
diff --git a/io/stat64.c b/io/stat64.c
index 09eb38ae91..16b0b11052 100644
--- a/io/stat64.c
+++ b/io/stat64.c
@@ -36,6 +36,7 @@
    functions in the shared library can adapt without needing to recompile
    all callers.  */
 
+#undef stat64
 int
 stat64 (const char *file, struct stat64 *buf)
 {