From f0e9a2afc9c61e833387e51cb04247e3391ef92e Mon Sep 17 00:00:00 2001
From: leitner <leitner>
Date: Fri, 20 May 2005 14:42:42 +0000
Subject: [PATCH] work around broken Solaris sys/socket.h

---
 io/io_passfd.c    | 12 ++++++++++--
 io/io_receivefd.c | 10 +++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/io/io_passfd.c b/io/io_passfd.c
index a336dd3..24c5eb9 100644
--- a/io/io_passfd.c
+++ b/io/io_passfd.c
@@ -8,8 +8,10 @@ int io_passfd(int64 sock,int64 fd) {
 #else
 
 #define _XOPEN_SOURCE
+#define _XOPEN_SOURCE_EXTENDED 1
 #include <stddef.h>
 #include <sys/types.h>
+#include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 #include <errno.h>
@@ -25,8 +27,11 @@ union fdmsg {
 int io_passfd(int64 sock,int64 fd) {
   struct msghdr msg;
   struct iovec  iov;
-#ifdef CMSG_LEN
+#ifdef CMSG_FIRSTHDR
   struct cmsghdr *cmsg;
+#ifndef CMSG_SPACE
+#define CMSG_SPACE(x) x+100
+#endif
   char buf[CMSG_SPACE(sizeof(int))];
 #endif
   iov.iov_len=1;
@@ -35,12 +40,15 @@ int io_passfd(int64 sock,int64 fd) {
   msg.msg_iovlen=1;
   msg.msg_name=0;
   msg.msg_namelen=0;
-#ifdef CMSG_LEN
+#ifdef CMSG_FIRSTHDR
   msg.msg_control = buf;
   msg.msg_controllen = sizeof(buf);
   cmsg = CMSG_FIRSTHDR(&msg);
   cmsg->cmsg_level = SOL_SOCKET;
   cmsg->cmsg_type = SCM_RIGHTS;
+#ifndef CMSG_LEN
+#define CMSG_LEN(x) x
+#endif
   cmsg->cmsg_len = CMSG_LEN(sizeof(int));
   msg.msg_controllen = cmsg->cmsg_len;
   *((int*)CMSG_DATA(cmsg))=fd;
diff --git a/io/io_receivefd.c b/io/io_receivefd.c
index 5e7c165..967289f 100644
--- a/io/io_receivefd.c
+++ b/io/io_receivefd.c
@@ -8,6 +8,7 @@ int64 io_receivefd(int64 sock) {
 #else
 
 #define _XOPEN_SOURCE
+#define _XOPEN_SOURCE_EXTENDED 1
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -23,7 +24,7 @@ union fdmsg {
 int64 io_receivefd(int64 sock) {
   struct iovec iov;
   struct msghdr msg;
-#ifdef CMSG_LEN
+#ifdef CMSG_FIRSTHDR
   union fdmsg cmsg;
   struct cmsghdr* h;
 #else
@@ -35,7 +36,7 @@ int64 io_receivefd(int64 sock) {
   iov.iov_len=100;
   msg.msg_name=name;
   msg.msg_namelen=100;
-#ifdef CMSG_LEN
+#ifdef CMSG_FIRSTHDR
   msg.msg_control=cmsg.buf;
   msg.msg_controllen=sizeof(union fdmsg);
 #else
@@ -44,9 +45,12 @@ int64 io_receivefd(int64 sock) {
 #endif
   msg.msg_iov = &iov;
   msg.msg_iovlen = 1;
-#ifdef CMSG_LEN
+#ifdef CMSG_FIRSTHDR
   msg.msg_flags=0;
   h=CMSG_FIRSTHDR(&msg);
+#ifndef CMSG_LEN
+#define CMSG_LEN(x) x
+#endif
   h->cmsg_len=CMSG_LEN(sizeof(int));
   h->cmsg_level=SOL_SOCKET;
   h->cmsg_type=SCM_RIGHTS;