diff options
Diffstat (limited to 'io')
| -rw-r--r-- | io/fcntl.h | 26 | ||||
| -rw-r--r-- | io/sys/stat.h | 9 |
2 files changed, 17 insertions, 18 deletions
diff --git a/io/fcntl.h b/io/fcntl.h index 330bb30885..2a2a29dc70 100644 --- a/io/fcntl.h +++ b/io/fcntl.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,1992,1994-2001,2003,2004,2005,2006,2007 +/* Copyright (C) 1991,1992,1994-2001,2003,2004,2005,2006,2007, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -158,11 +158,11 @@ extern int creat64 (__const char *__file, __mode_t __mode) __nonnull ((1)); # ifndef __USE_FILE_OFFSET64 extern int lockf (int __fd, int __cmd, __off_t __len); # else -# ifdef __REDIRECT +# ifdef __REDIRECT extern int __REDIRECT (lockf, (int __fd, int __cmd, __off64_t __len), lockf64); -# else -# define lockf lockf64 -# endif +# else +# define lockf lockf64 +# endif # endif # ifdef __USE_LARGEFILE64 extern int lockf64 (int __fd, int __cmd, __off64_t __len); @@ -176,13 +176,13 @@ extern int lockf64 (int __fd, int __cmd, __off64_t __len); extern int posix_fadvise (int __fd, __off_t __offset, __off_t __len, int __advise) __THROW; # else -# ifdef __REDIRECT_NTH + # ifdef __REDIRECT_NTH extern int __REDIRECT_NTH (posix_fadvise, (int __fd, __off64_t __offset, __off64_t __len, int __advise), posix_fadvise64); -# else -# define posix_fadvise posix_fadvise64 -# endif +# else +# define posix_fadvise posix_fadvise64 +# endif # endif # ifdef __USE_LARGEFILE64 extern int posix_fadvise64 (int __fd, __off64_t __offset, __off64_t __len, @@ -197,13 +197,13 @@ extern int posix_fadvise64 (int __fd, __off64_t __offset, __off64_t __len, # ifndef __USE_FILE_OFFSET64 extern int posix_fallocate (int __fd, __off_t __offset, __off_t __len); # else -# ifdef __REDIRECT + # ifdef __REDIRECT extern int __REDIRECT (posix_fallocate, (int __fd, __off64_t __offset, __off64_t __len), posix_fallocate64); -# else -# define posix_fallocate posix_fallocate64 -# endif +# else +# define posix_fallocate posix_fallocate64 +# endif # endif # ifdef __USE_LARGEFILE64 extern int posix_fallocate64 (int __fd, __off64_t __offset, __off64_t __len); diff --git a/io/sys/stat.h b/io/sys/stat.h index 4b21a2e1ce..7d769052a1 100644 --- a/io/sys/stat.h +++ b/io/sys/stat.h @@ -254,7 +254,7 @@ extern int fstatat64 (int __fd, __const char *__restrict __file, __THROW __nonnull ((2, 3)); #endif -#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED +#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K # ifndef __USE_FILE_OFFSET64 /* Get file attributes about FILE and put them in BUF. If FILE is a symbolic link, do not follow it. */ @@ -333,14 +333,14 @@ extern int mkdirat (int __fd, __const char *__path, __mode_t __mode) #if defined __USE_MISC || defined __USE_BSD || defined __USE_XOPEN_EXTENDED extern int mknod (__const char *__path, __mode_t __mode, __dev_t __dev) __THROW __nonnull ((1)); -#endif -#ifdef __USE_ATFILE +# ifdef __USE_ATFILE /* Like mknod, create a new device file with permission bits MODE and device number DEV. But interpret relative PATH names relative to the directory associated with FD. */ extern int mknodat (int __fd, __const char *__path, __mode_t __mode, __dev_t __dev) __THROW __nonnull ((2)); +# endif #endif @@ -365,8 +365,7 @@ extern int utimensat (int __fd, __const char *__path, __THROW __nonnull ((2)); #endif -#ifdef __USE_GNU -/* XXX This will change to the macro for the next 2008 POSIX revision. */ +#ifdef __USE_XOPEN2K8 /* Set file access and modification times of the file associated with FD. */ extern int futimens (int __fd, __const struct timespec __times[2]) __THROW; #endif |