From 88baa1ed437db0f062e49b87cff59002ec8f7ab2 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 2 Mar 2010 11:55:34 +0100 Subject: [PATCH] spawn: Don't override the system defined values on FreeBSD 8. --- ChangeLog | 9 +++++++++ lib/spawn.in.h | 20 +++++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7c7482f3..28c48ae6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-03-02 Bruno Haible + + spawn: Don't override the system defined values on FreeBSD 8. + * lib/spawn.in.h (POSIX_SPAWN_RESETIDS, POSIX_SPAWN_SETPGROUP, + POSIX_SPAWN_SETSIGDEF, POSIX_SPAWN_SETSIGMASK, + POSIX_SPAWN_SETSCHEDPARAM, POSIX_SPAWN_SETSCHEDULER): Don't redefine + if HAVE_POSIX_SPAWN is 1. + Reported by Johan van Selst via Eric Blake. + 2010-03-01 Bruno Haible * doc/gnulib-tool.texi (Initial import): Clarify the requirements diff --git a/lib/spawn.in.h b/lib/spawn.in.h index 84ba93c1a..1e8c936bd 100644 --- a/lib/spawn.in.h +++ b/lib/spawn.in.h @@ -110,17 +110,19 @@ typedef struct /* Flags to be set in the `posix_spawnattr_t'. */ -#if @REPLACE_POSIX_SPAWN@ +#if !@HAVE_POSIX_SPAWN@ +# if @REPLACE_POSIX_SPAWN@ /* Use the values from the system, for better compatibility. */ /* But this implementation does not support AIX extensions. */ -# undef POSIX_SPAWN_FORK_HANDLERS -#else -# define POSIX_SPAWN_RESETIDS 0x01 -# define POSIX_SPAWN_SETPGROUP 0x02 -# define POSIX_SPAWN_SETSIGDEF 0x04 -# define POSIX_SPAWN_SETSIGMASK 0x08 -# define POSIX_SPAWN_SETSCHEDPARAM 0x10 -# define POSIX_SPAWN_SETSCHEDULER 0x20 +# undef POSIX_SPAWN_FORK_HANDLERS +# else +# define POSIX_SPAWN_RESETIDS 0x01 +# define POSIX_SPAWN_SETPGROUP 0x02 +# define POSIX_SPAWN_SETSIGDEF 0x04 +# define POSIX_SPAWN_SETSIGMASK 0x08 +# define POSIX_SPAWN_SETSCHEDPARAM 0x10 +# define POSIX_SPAWN_SETSCHEDULER 0x20 +# endif #endif /* A GNU extension. Use the next free bit position. */ #define POSIX_SPAWN_USEVFORK \ -- 2.11.0