Update.

[kopensolaris-gnu/glibc.git] / io / ftw.h

diff --git a/io/ftw.h b/io/ftw.h
index f71a86e..f2c59c4 100644 (file)
--- a/io/ftw.h
+++ b/io/ftw.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1996, 1997, 1998 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
@@ -26,7 +26,7 @@
 #include <features.h>
 
 #include <sys/types.h>
-#include <bits/stat.h>
+#include <sys/stat.h>
 
 
 __BEGIN_DECLS
@@ -88,7 +88,7 @@ struct FTW
 /* Convenient types for callback functions.  */
 typedef int (*__ftw_func_t) __P ((__const char *__filename,
                                  __const struct stat *__status, int __flag));
-#if defined __USE_LARGEFILE64 || defined __USE_FILE_OFFSET64
+#ifdef __USE_LARGEFILE64
 typedef int (*__ftw64_func_t) __P ((__const char *__filename,
                                    __const struct stat64 *__status,
                                    int __flag));
@@ -97,7 +97,7 @@ typedef int (*__ftw64_func_t) __P ((__const char *__filename,
 typedef int (*__nftw_func_t) __P ((__const char *__filename,
                                   __const struct stat *__status, int __flag,
                                   struct FTW *__info));
-# if defined __USE_LARGEFILE64 || defined __USE_FILE_OFFSET64
+# ifdef __USE_LARGEFILE64
 typedef int (*__nftw64_func_t) __P ((__const char *__filename,
                                     __const struct stat64 *__status,
                                     int __flag, struct FTW *__info));
@@ -109,8 +109,12 @@ typedef int (*__nftw64_func_t) __P ((__const char *__filename,
 extern int ftw __P ((__const char *__dir, __ftw_func_t __func,
                     int __descriptors));
 #else
-extern int ftw __P ((__const char *__dir, __ftw64_func_t __func,
-                    int __descriptors)) __asm__ ("ftw64");
+# ifdef __REDIRECT
+extern int __REDIRECT (ftw, __P ((__const char *__dir, __ftw_func_t __func,
+                                 int __descriptors)), ftw64);
+# else
+#  define ftw ftw64
+# endif
 #endif
 #ifdef __USE_LARGEFILE64
 extern int ftw64 __P ((__const char *__dir, __ftw64_func_t __func,
@@ -124,8 +128,12 @@ extern int ftw64 __P ((__const char *__dir, __ftw64_func_t __func,
 extern int nftw __P ((__const char *__dir, __nftw_func_t __func,
                      int __descriptors, int __flag));
 # else
-extern int nftw __P ((__const char *__dir, __nftw64_func_t __func,
-                     int __descriptors, int __flag)) __asm__ ("nftw64");
+#  ifdef __REDIRECT
+extern int __REDIRECT (nftw, __P ((__const char *__dir, __nftw_func_t __func,
+                                  int __descriptors, int __flag)), nftw64);
+#  else
+#   define nftw nftw64
+#  endif
 # endif
 # ifdef __USE_LARGEFILE64
 extern int nftw64 __P ((__const char *__dir, __nftw64_func_t __func,