diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | io/fcntl.h | 26 | ||||
-rw-r--r-- | streams/stropts.h | 3 |
3 files changed, 30 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index fd5e9d3c7a..a3b78b078f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-10 Samuel Thibault <samuel.thibault@ens-lyon.org> + * io/fcntl.h (mode_t, off_t, pid_t): Define types. + (__mode_t_defined, __off_t_defined, __pid_t_defined): Define macros. + * streams/stropts.h (t_scalar_t): Define type. + * sysdeps/generic/paths.h (_PATH_MAN): Set to "/usr/share/man" (_PATH_PRESERVE): Set to "/var/lib". (_PATH_RWHODIR): Set to "/var/spool/rwho". diff --git a/io/fcntl.h b/io/fcntl.h index 8b8726a440..c7d5e6972c 100644 --- a/io/fcntl.h +++ b/io/fcntl.h @@ -1,5 +1,4 @@ -/* Copyright (C) 1991,1992,1994-2001,2003-2007,2009-2011,2012 - Free Software Foundation, Inc. +/* Copyright (C) 1991-2012 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 @@ -32,6 +31,29 @@ __BEGIN_DECLS numbers and flag bits for `open', `fcntl', et al. */ #include <bits/fcntl.h> +#if defined __USE_XOPEN || defined __USE_XOPEN2K +/* The Single Unix specification says that some more types are + available here. */ +# ifndef __mode_t_defined +typedef __mode_t mode_t; +# define __mode_t_defined +# endif + +# ifndef __off_t_defined +# ifndef __USE_FILE_OFFSET64 +typedef __off_t off_t; +# else +typedef __off64_t off_t; +# endif +# define __off_t_defined +# endif + +# ifndef __pid_t_defined +typedef __pid_t pid_t; +# define __pid_t_defined +# endif +#endif /* X/Open */ + /* For XPG all symbols from <sys/stat.h> should also be available. */ #if defined __USE_XOPEN || defined __USE_XOPEN2K8 # include <bits/types.h> /* For __mode_t and __dev_t. */ diff --git a/streams/stropts.h b/streams/stropts.h index 80fe460b77..fa67fef400 100644 --- a/streams/stropts.h +++ b/streams/stropts.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2000, 2002, 2003, 2012 Free Software Foundation, Inc. +/* Copyright (C) 1998-2012 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 @@ -32,6 +32,7 @@ typedef __uid_t uid_t; # define __uid_t_defined #endif +typedef __t_scalar_t t_scalar_t; typedef __t_uscalar_t t_uscalar_t; /* Get system specific contants. */ |