diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | bits/sigaction.h | 4 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/bits/fcntl.h | 11 |
3 files changed, 17 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index fd2752f81c..2dcbfd5a8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-05-10 Samuel Thibault <samuel.thibault@ens-lyon.org> + + * bits/sigaction.h [__USE_XOPEN2K8]: Define SA_RESTART, + SA_NODEFER, SA_RESETHAND. + * sysdeps/mach/hurd/bits/fcntl.h [__USE_XOPEN2K8]: Define + O_NOFOLLOW, O_DIRECTORY, O_CLOEXEC, F_GETOWN, F_SETOWN, + F_DUPFD_CLOEXEC. + 2012-05-10 Thomas Schwinge <thomas@schwinge.name> * elf/Makefile (pldd-modules): Define unconditionally. diff --git a/bits/sigaction.h b/bits/sigaction.h index a5e1d186ac..a737660ce4 100644 --- a/bits/sigaction.h +++ b/bits/sigaction.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,92,96,97,98,2001 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 @@ -54,6 +54,8 @@ struct sigaction /* Bits in `sa_flags'. */ #if defined __USE_UNIX98 || defined __USE_MISC # define SA_ONSTACK 0x0001 /* Take signal on signal stack. */ +#endif +#if defined __USE_UNIX98 || defined __USE_MISC || defined __USE_XOPEN2K8 # define SA_RESTART 0x0002 /* Restart syscall on signal return. */ # define SA_NODEFER 0x0010 /* Don't automatically block the signal when its handler is being executed. */ diff --git a/sysdeps/mach/hurd/bits/fcntl.h b/sysdeps/mach/hurd/bits/fcntl.h index 4224bf18ff..1d24c7399d 100644 --- a/sysdeps/mach/hurd/bits/fcntl.h +++ b/sysdeps/mach/hurd/bits/fcntl.h @@ -1,6 +1,5 @@ /* O_*, F_*, FD_* bit values for GNU. - Copyright (C) 1993,1994,1996,1997,1998,1999,2000,2001,2004,2007 - Free Software Foundation, Inc. + Copyright (C) 1993-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 @@ -54,7 +53,9 @@ #ifdef __USE_GNU # define O_NOLINK 0x0040 /* No name mappings on final component. */ # define O_NOTRANS 0x0080 /* No translator on final component. */ +#endif +#ifdef __USE_XOPEN2K8 # define O_NOFOLLOW 0x00100000 /* Produce ENOENT if file is a symlink. */ # define O_DIRECTORY 0x00200000 /* Produce ENOTDIR if not a directory. */ #endif @@ -118,7 +119,7 @@ once the file has been opened. */ #define O_TRUNC 0x00010000 /* Truncate file to zero length. */ -#ifdef __USE_GNU +#ifdef __USE_XOPEN2K8 # define O_CLOEXEC 0x00400000 /* Set FD_CLOEXEC. */ #endif @@ -158,7 +159,7 @@ #define F_SETFD 2 /* Set file descriptor flags. */ #define F_GETFL 3 /* Get file status flags. */ #define F_SETFL 4 /* Set file status flags. */ -#if defined __USE_BSD || defined __USE_UNIX98 +#if defined __USE_BSD || defined __USE_UNIX98 || defined __USE_XOPEN2K8 # define F_GETOWN 5 /* Get owner (receiver of SIGIO). */ # define F_SETOWN 6 /* Set owner (receiver of SIGIO). */ #endif @@ -166,7 +167,7 @@ #define F_SETLK 8 /* Set record locking info (non-blocking). */ #define F_SETLKW 9 /* Set record locking info (blocking). */ -#ifdef __USE_GNU +#ifdef __USE_XOPEN2K8 # define F_DUPFD_CLOEXEC 1030 /* Duplicate, set FD_CLOEXEC on new one. */ #endif |