* io/sys/stat.h (fstatat): If __REDIRECT_NTH isn't defined,

	define fstatat to fstatat64.
	(fstatat64): Only provide prototype if __USE_LARGEFILE64,
	similarly with the inline.
	* io/fcntl.h (openat64): Only provide prototype if __USE_LARGEFILE64.

diff --git a/ChangeLog b/ChangeLog
index a3921fbc5824083f1ccdcf32286a877c0c48086a..bb93ff2a17d5f5ba8a272eb9fedccffb9e14544d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-17  Jakub Jelinek  <jakub@redhat.com>
+
+       * io/sys/stat.h (fstatat): If __REDIRECT_NTH isn't defined,
+       define fstatat to fstatat64.
+       (fstatat64): Only provide prototype if __USE_LARGEFILE64,
+       similarly with the inline.
+       * io/fcntl.h (openat64): Only provide prototype if __USE_LARGEFILE64.
+
 2005-11-17  Steven Munroe  <sjmunroe@us.ibm.com>
 
        [BZ #1877]

diff --git a/io/fcntl.h b/io/fcntl.h
index 8e13d33dcc91c1e49d91b004bcd42bb9524df41a..313540f96f08aeec2e89457b47b5ae07b2c53e53 100644 (file)
--- a/io/fcntl.h
+++ b/io/fcntl.h
@@ -114,8 +114,10 @@ extern int __REDIRECT (openat, (int __fd, __const char *__file, int __oflag,
 #  endif
 # endif
 
+# ifdef __USE_LARGEFILE64
 extern int openat64 (int __fd, __const char *__file, int __oflag, ...)
      __nonnull ((2));
+# endif
 #endif
 
 /* Create and open FILE, with mode MODE.  This takes an `int' MODE

diff --git a/io/sys/stat.h b/io/sys/stat.h
index c4b307f2bb613f0087e80892fccf8ec6a40f8619..7221b4e7be8a83fe00ce7d15847c897de5b34852 100644 (file)
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -236,13 +236,19 @@ extern int fstat64 (int __fd, struct stat64 *__buf) __THROW __nonnull ((2));
 extern int fstatat (int __fd, __const char *__file, struct stat *__buf,
                    int __flag) __THROW __nonnull ((2, 3));
 # else
+#  ifdef __REDIRECT_NTH
 extern int __REDIRECT_NTH (fstatat, (int __fd, __const char *__file,
                                     struct stat *__buf, int __flag),
                           fstatat64) __nonnull ((2, 3));
+#  else
+#   define fstatat fstatat64
+#  endif
 # endif
 
+# ifdef __USE_LARGEFILE64
 extern int fstatat64 (int __fd, __const char *__file, struct stat64 *__buf,
                      int __flag) __THROW __nonnull ((2, 3));
+# endif
 #endif
 
 #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
@@ -446,15 +452,16 @@ __NTH (fstat64 (int __fd, struct stat64 *__statbuf))
 {
   return __fxstat64 (_STAT_VER, __fd, __statbuf);
 }
-# endif
 
-# ifdef __USE_GNU
+#  ifdef __USE_GNU
 extern __inline__ int
 __NTH (fstatat64 (int __fd, __const char *__filename, struct stat64 *__statbuf,
                  int __flag))
 {
   return __fxstatat64 (_STAT_VER, __fd, __filename, __statbuf, __flag);
 }
+#  endif
+
 # endif
 
 #endif