Re: "vendor" patch pickup

From: "Marcus Holland-Moritz" <mhx-perl@gmx.net>
Message-ID: <009b01c3730c$ac45e750$0c2f1fac@R2D2>

(Gentoo: take Marcus' version of the __THROW patch and
even further #ifdef-protect it with __GLIBC__.)

p4raw-id: //depot/perl@21030

diff --git a/perl.h b/perl.h
index cd735af..01458d9 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -713,9 +713,14 @@ int usleep(unsigned int);
 #endif
 
 /* sockatmark() is so new (2001) that many places might have it hidden
- * behind some -D_BLAH_BLAH_SOURCE guard. */
+ * behind some -D_BLAH_BLAH_SOURCE guard.  The __THROW magic is required
+ * e.g. in Gentoo, see http://bugs.gentoo.org/show_bug.cgi?id=12605 */
 #if defined(HAS_SOCKATMARK) && !defined(HAS_SOCKATMARK_PROTO)
+# if defined(__THROW) && defined(__GLIBC__)
+int sockatmark(int) __THROW;
+# else
 int sockatmark(int);
+# endif
 #endif
 
 #ifdef SETERRNO