summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <tschwinge@gnu.org>2008-10-02 16:06:21 +0000
committerThomas Schwinge <tschwinge@gnu.org>2008-10-02 16:06:21 +0000
commitac7ddb0d9557348206f3bc9bd2bf65b7d7b6409a (patch)
treefbebd4815949efc891e016ed1327fa155fba1e19
parentbcef90ac5ab304233df23e4ee924cc294d2864c9 (diff)
2008-10-02 Thomas Schwinge <tschwinge@gnu.org>
* glue-include/linux/socket.h: Revert last change. (MSG_NOSIGNAL): Guard definition and add a compile-time warning.
-rw-r--r--pfinet/ChangeLog5
-rw-r--r--pfinet/glue-include/linux/socket.h4
2 files changed, 9 insertions, 0 deletions
diff --git a/pfinet/ChangeLog b/pfinet/ChangeLog
index 8243a77a..f7d002b4 100644
--- a/pfinet/ChangeLog
+++ b/pfinet/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-02 Thomas Schwinge <tschwinge@gnu.org>
+
+ * glue-include/linux/socket.h: Revert last change.
+ (MSG_NOSIGNAL): Guard definition and add a compile-time warning.
+
2008-07-11 Samuel Thibault <samuel.thibault@ens-lyon.org>
* glue-include/linux/socket.h (MSG_NOSIGNAL): Remove macro.
diff --git a/pfinet/glue-include/linux/socket.h b/pfinet/glue-include/linux/socket.h
index 3f2a7971..820ed00f 100644
--- a/pfinet/glue-include/linux/socket.h
+++ b/pfinet/glue-include/linux/socket.h
@@ -75,6 +75,10 @@ put_cmsg(struct msghdr *msg, int level, int type, int len, void *data)
{ return 0; }
#endif
+#ifndef MSG_NOSIGNAL
+# warning "http://lists.gnu.org/archive/html/bug-hurd/2008-10/msg00007.html"
+# define MSG_NOSIGNAL 0
+#endif
#define MSG_ERRQUEUE 0
/* There is no SOCK_PACKET, it is a bad bad thing. This chicanery is