From: Bruno Haible <bruno@clisp.org>
Date: Thu, 31 Dec 2009 21:02:09 +0000 (+0100)
Subject: spawn: Fix misapplied patch.
X-Git-Tag: v0.1~4943
X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=1c7503b3ca560f5a488fa217a55ec6c2a8933a32;p=gnulib.git

spawn: Fix misapplied patch.
---

diff --git a/ChangeLog b/ChangeLog
index 348b309f04..0660ef2acb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-31  Bruno Haible  <bruno@clisp.org>
+
+	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  <bruno@clisp.org>
 
 	times: Update after sys_times changed.
diff --git a/lib/spawn.in.h b/lib/spawn.in.h
index 8f86a9778f..3c42bfae5a 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@