From 1c7503b3ca560f5a488fa217a55ec6c2a8933a32 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 31 Dec 2009 22:02:09 +0100 Subject: [PATCH] spawn: Fix misapplied patch. --- ChangeLog | 7 +++++++ lib/spawn.in.h | 30 ++++++++++++++++++------------ 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 348b309f0..0660ef2ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2009-12-31 Bruno Haible + spawn: Fix misapplied patch. + * lib/spawn.in.h (posix_spawnattr_getflags, posix_spawnattr_setflags, + posix_spawnattr_getpgroup, posix_spawnattr_setpgroup): Correct the link + warnings for GNULIB_POSIXCHECK. + +2009-12-31 Bruno Haible + times: Update after sys_times changed. * m4/times.m4: New file, extracted from modules/times. Set HAVE_TIMES. * modules/times (Files): Add it. diff --git a/lib/spawn.in.h b/lib/spawn.in.h index 8f86a9778..3c42bfae5 100644 --- a/lib/spawn.in.h +++ b/lib/spawn.in.h @@ -306,10 +306,10 @@ extern int posix_spawnattr_getflags (const posix_spawnattr_t *_Restrict_ __attr, __THROW _GL_ARG_NONNULL ((1, 2)); # endif #elif defined GNULIB_POSIXCHECK -# undef posix_spawnattr_getsigdefault -# define posix_spawnattr_getsigdefault(a, b) \ - (GL_LINK_WARNING ("posix_spawnattr_getsigdefault is unportable - " \ - "use gnulib module posix_spawnattr_getsigdefault for portability"), \ +# undef posix_spawnattr_getflags +# define posix_spawnattr_getflags(a, b) \ + (GL_LINK_WARNING ("posix_spawnattr_getflags is unportable - " \ + "use gnulib module posix_spawnattr_getflags for portability"), \ posix_spawnattr_getsigdefault (a, b)) #endif @@ -324,10 +324,10 @@ extern int posix_spawnattr_setflags (posix_spawnattr_t *__attr, __THROW _GL_ARG_NONNULL ((1)); # endif #elif defined GNULIB_POSIXCHECK -# undef posix_spawnattr_getflags -# define posix_spawnattr_getflags(a, b) \ - (GL_LINK_WARNING ("posix_spawnattr_getflags is unportable - " \ - "use gnulib module posix_spawnattr_getflags for portability"), \ +# undef posix_spawnattr_setflags +# define posix_spawnattr_setflags(a, b) \ + (GL_LINK_WARNING ("posix_spawnattr_setflags is unportable - " \ + "use gnulib module posix_spawnattr_setflags for portability"), \ posix_spawnattr_getflags (a, b)) #endif @@ -342,10 +342,10 @@ extern int posix_spawnattr_getpgroup (const posix_spawnattr_t *_Restrict_ __attr __THROW _GL_ARG_NONNULL ((1, 2)); # endif #elif defined GNULIB_POSIXCHECK -# undef posix_spawnattr_setflags -# define posix_spawnattr_setflags(a, b) \ - (GL_LINK_WARNING ("posix_spawnattr_setflags is unportable - " \ - "use gnulib module posix_spawnattr_setflags for portability"), \ +# undef posix_spawnattr_getpgroup +# define posix_spawnattr_getpgroup(a, b) \ + (GL_LINK_WARNING ("posix_spawnattr_getpgroup is unportable - " \ + "use gnulib module posix_spawnattr_getpgroup for portability"), \ posix_spawnattr_setflags (a, b)) #endif @@ -359,6 +359,12 @@ extern int posix_spawnattr_setpgroup (posix_spawnattr_t *__attr, pid_t __pgroup) __THROW _GL_ARG_NONNULL ((1)); # endif +#elif defined GNULIB_POSIXCHECK +# undef posix_spawnattr_setpgroup +# define posix_spawnattr_setpgroup(a, b) \ + (GL_LINK_WARNING ("posix_spawnattr_setpgroup is unportable - " \ + "use gnulib module posix_spawnattr_setpgroup for portability"), \ + posix_spawnattr_setflags (a, b)) #endif #if @GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY@ -- 2.11.0