update from main archive 960105cvs/libc-970107cvs/libc-970106

2 files changed, 5 insertions, 5 deletions

diff --git a/io/ftw.c b/io/ftw.c
index 6bd97e6999..d7ec716936 100644
--- a/io/ftw.c
+++ b/io/ftw.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ian Lance Taylor (ian@airs.com).
 
@@ -36,7 +36,7 @@
 
 static int
 ftw_dir (DIR **dirs, int level, int descriptors, char *dir, size_t len,
-	 int (*func) (const char *file, struct stat *status, int flag))
+	 int (*func) (const char *file, const struct stat *status, int flag))
 {
   int got;
   struct dirent *entry;
@@ -151,7 +151,7 @@ ftw_dir (DIR **dirs, int level, int descriptors, char *dir, size_t len,
 
 int
 ftw (const char *dir,
-     int (*func) (const char *file, struct stat *status, int flag),
+     int (*func) (const char *file, const struct stat *status, int flag),
      int descriptors)
 {
   DIR **dirs;
diff --git a/io/ftw.h b/io/ftw.h
index 9cc9b4fd18..0bfdf37431 100644
--- a/io/ftw.h
+++ b/io/ftw.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1996, 1997 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ian Lance Taylor (ian@airs.com).
 
@@ -37,7 +37,7 @@
 /* Call a function on every element in a directory tree.  */
 extern int ftw __P ((__const char *__dir,
 		     int (*__func) (__const char *__file,
-				    struct stat *__status,
+				    __const struct stat *__status,
 				    int __flag),
 		     int __descriptors));