From 91f91bcb3abda3780347d681c3bef6201b9ca60f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 20 Jul 2009 13:34:16 -0400 Subject: sync a few headers with glibc (no functional changes) Signed-off-by: Mike Frysinger --- include/dirent.h | 14 ++++++++------ include/fcntl.h | 39 +++++++++++++++++++-------------------- include/stdlib.h | 32 +++++++++++++++----------------- include/sys/time.h | 9 +++++---- 4 files changed, 47 insertions(+), 47 deletions(-) diff --git a/include/dirent.h b/include/dirent.h index 25fd77c4e..d4fc5c7d9 100644 --- a/include/dirent.h +++ b/include/dirent.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2000, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1991-2000, 2003-2005, 2009 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 @@ -226,15 +226,17 @@ libc_hidden_proto(dirfd) # define dirfd(dirp) _DIR_dirfd (dirp) # endif -# ifndef MAXNAMLEN +# if defined __USE_BSD || defined __USE_MISC +# ifndef MAXNAMLEN /* Get the definitions of the POSIX.1 limits. */ # include /* `MAXNAMLEN' is the BSD name for what POSIX calls `NAME_MAX'. */ -# ifdef NAME_MAX -# define MAXNAMLEN NAME_MAX -# else -# define MAXNAMLEN 255 +# ifdef NAME_MAX +# define MAXNAMLEN NAME_MAX +# else +# define MAXNAMLEN 255 +# endif # endif # endif diff --git a/include/fcntl.h b/include/fcntl.h index 8c3768216..5d0e4aa82 100644 --- a/include/fcntl.h +++ b/include/fcntl.h @@ -1,5 +1,5 @@ -/* Copyright (C) 1991,1992,1994-2001,2003,2004,2005 - Free Software Foundation, Inc. +/* 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. The GNU C Library is free software; you can redistribute it and/or @@ -171,11 +171,11 @@ extern int creat64 (__const char *__file, __mode_t __mode) __nonnull ((1)); extern int lockf (int __fd, int __cmd, __off_t __len); libc_hidden_proto(lockf) # 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); @@ -190,13 +190,13 @@ libc_hidden_proto(lockf64) 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 + __off64_t __len, int __advise), + posix_fadvise64); +# else +# define posix_fadvise posix_fadvise64 +# endif # endif # ifdef __USE_LARGEFILE64 extern int posix_fadvise64 (int __fd, __off64_t __offset, __off64_t __len, @@ -216,24 +216,23 @@ 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 +# else +# define posix_fallocate posix_fallocate64 +# endif # endif +# ifdef __USE_LARGEFILE64 +extern int posix_fallocate64 (int __fd, __off64_t __offset, __off64_t __len); # endif +#endif #ifdef __UCLIBC_HAS_THREADS_NATIVE__ extern int __fcntl_nocancel (int fd, int cmd, ...); #endif -# ifdef __USE_LARGEFILE64 -extern int posix_fallocate64 (int __fd, __off64_t __offset, __off64_t __len); -# endif -#endif - __END_DECLS #endif /* fcntl.h */ diff --git a/include/stdlib.h b/include/stdlib.h index f066199b1..e462c1c93 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2003, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1991-2007, 2009 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 @@ -58,7 +58,7 @@ __BEGIN_DECLS # endif /* This is the type of the argument to `wait'. The funky union - causes redeclarations with ether `int *' or `union wait *' to be + causes redeclarations with either `int *' or `union wait *' to be allowed without complaint. __WAIT_STATUS_DEFN is the type used in the actual function definitions. */ @@ -84,14 +84,14 @@ typedef union # endif /* Use BSD. */ /* Define the macros also would define this way. */ -# define WEXITSTATUS(status) __WEXITSTATUS(__WAIT_INT(status)) -# define WTERMSIG(status) __WTERMSIG(__WAIT_INT(status)) -# define WSTOPSIG(status) __WSTOPSIG(__WAIT_INT(status)) -# define WIFEXITED(status) __WIFEXITED(__WAIT_INT(status)) -# define WIFSIGNALED(status) __WIFSIGNALED(__WAIT_INT(status)) -# define WIFSTOPPED(status) __WIFSTOPPED(__WAIT_INT(status)) +# define WEXITSTATUS(status) __WEXITSTATUS (__WAIT_INT (status)) +# define WTERMSIG(status) __WTERMSIG (__WAIT_INT (status)) +# define WSTOPSIG(status) __WSTOPSIG (__WAIT_INT (status)) +# define WIFEXITED(status) __WIFEXITED (__WAIT_INT (status)) +# define WIFSIGNALED(status) __WIFSIGNALED (__WAIT_INT (status)) +# define WIFSTOPPED(status) __WIFSTOPPED (__WAIT_INT (status)) # if 0 /* def __WIFCONTINUED */ -# define WIFCONTINUED(status) __WIFCONTINUED(__WAIT_INT(status)) +# define WIFCONTINUED(status) __WIFCONTINUED (__WAIT_INT (status)) # endif #endif /* X/Open and not included. */ @@ -654,19 +654,17 @@ __END_NAMESPACE_STD #if 0 /* def __USE_GNU */ /* Return a malloc'd string containing the canonical absolute name of the - named file. The last file name component need not exist, and may be a - symlink to a nonexistent file. */ + existing named file. */ extern char *canonicalize_file_name (__const char *__name) __THROW __nonnull ((1)) __wur; #endif #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED -/* Return the canonical absolute name of file NAME. The last file name - component need not exist, and may be a symlink to a nonexistent file. - If RESOLVED is null, the result is malloc'd; otherwise, if the canonical - name is PATH_MAX chars or more, returns null with `errno' set to - ENAMETOOLONG; if the name fits in fewer than PATH_MAX chars, returns the - name in RESOLVED. */ +/* Return the canonical absolute name of file NAME. If RESOLVED is + null, the result is malloc'd; otherwise, if the canonical name is + PATH_MAX chars or more, returns null with `errno' set to + ENAMETOOLONG; if the name fits in fewer than PATH_MAX chars, + returns the name in RESOLVED. */ /* we choose to handle __resolved==NULL as crash :) */ extern char *realpath (__const char *__restrict __name, char *__restrict __resolved) __THROW __wur __nonnull((2)); diff --git a/include/sys/time.h b/include/sys/time.h index 1dfe4f36e..a6388e454 100644 --- a/include/sys/time.h +++ b/include/sys/time.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1991-1994,1996-2002,2003,2005 Free Software Foundation, Inc. +/* Copyright (C) 1991-1994,1996-2003,2005,2006,2009 + 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 @@ -166,9 +167,9 @@ extern int futimesat (int __fd, __const char *__file, NOTE: `timercmp' does not work for >= or <=. */ # define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec) # define timerclear(tvp) ((tvp)->tv_sec = (tvp)->tv_usec = 0) -# define timercmp(a, b, CMP) \ - (((a)->tv_sec == (b)->tv_sec) ? \ - ((a)->tv_usec CMP (b)->tv_usec) : \ +# define timercmp(a, b, CMP) \ + (((a)->tv_sec == (b)->tv_sec) ? \ + ((a)->tv_usec CMP (b)->tv_usec) : \ ((a)->tv_sec CMP (b)->tv_sec)) # define timeradd(a, b, result) \ do { \ -- cgit v1.2.3