0
@@ -38,13 +38,6 @@
0
   // always included by unistd.h and sys/types.h.
0
   #include <sys/uio.h>
0
 #endif
0
-#ifdef __SOLARIS9__
0
-	// These macros are missing from sys/socket.h on Solaris 9.
0
-	#define CMSG_SPACE(l)	\
0
-		((unsigned int)_CMSG_HDR_ALIGN(sizeof (struct cmsghdr) + (l)))
0
-	#define CMSG_LEN(l)	\
0
-		((unsigned int)_CMSG_DATA_ALIGN(sizeof (struct cmsghdr)) + (l))
0
-#endif
0
 
0
 #include "Exceptions.h"
0
 #include "Utils.h"
0
@@ -292,7 +285,7 @@ public:
0
     struct msghdr msg;
0
     struct iovec vec;
0
     char dummy[1];
0
-		#ifdef __APPLE__
0
+		#if defined(__APPLE__) || defined(__SOLARIS9__)
0
       struct {
0
         struct cmsghdr header;
0
         int fd;
0
@@ -320,7 +313,7 @@ public:
0
     control_header = CMSG_FIRSTHDR(&msg);
0
     control_header->cmsg_level = SOL_SOCKET;
0
     control_header->cmsg_type  = SCM_RIGHTS;
0
-		#ifdef __APPLE__
0
+		#if defined(__APPLE__) || defined(__SOLARIS9__)
0
       control_header->cmsg_len = sizeof(control_data);
0
       control_data.fd = fileDescriptor;
0
     #else
0
@@ -468,7 +461,7 @@ public:
0
     struct msghdr msg;
0
     struct iovec vec;
0
     char dummy[1];
0
-		#ifdef __APPLE__
0
+		#if defined(__APPLE__) || defined(__SOLARIS9__)
0
       // File descriptor passing macros (CMSG_*) seem to be broken
0
       // on 64-bit MacOS X. This structure works around the problem.
0
       struct {
0
@@ -507,7 +500,7 @@ public:
0
      || control_header->cmsg_type  != SCM_RIGHTS) {
0
       throw IOException("No valid file descriptor received.");
0
     }
0
-		#ifdef __APPLE__
0
+		#if defined(__APPLE__) || defined(__SOLARIS9__)
0
       return control_data.fd;
0
     #else
0
       return *((int *) CMSG_DATA(control_header));

0
@@ -21,8 +21,11 @@ $LIBS=""
0
 if RUBY_PLATFORM =~ /solaris/
0
   have_library('xnet')
0
   $CFLAGS << " -D_XPG4_2"
0
+	if RUBY_PLATFORM =~ /solaris2.9/
0
+		$CFLAGS << " -D__SOLARIS9__"
0
+	end
0
 end
0
 
0
 with_cflags($CFLAGS) do
0
   create_makefile('native_support')
0
-end
0
\ No newline at end of file
0
+end

0
@@ -29,13 +29,6 @@
0
   // always included by unistd.h and sys/types.h.
0
   #include <sys/uio.h>
0
 #endif
0
-#ifdef __SOLARIS9__
0
-	// These macros are missing from sys/socket.h on Solaris 9.
0
-	#define CMSG_SPACE(l)	\
0
-		((unsigned int)_CMSG_HDR_ALIGN(sizeof (struct cmsghdr) + (l)))
0
-	#define CMSG_LEN(l)	\
0
-		((unsigned int)_CMSG_DATA_ALIGN(sizeof (struct cmsghdr)) + (l))
0
-#endif
0
 
0
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
0
 
0
@@ -57,7 +50,7 @@ send_fd(VALUE self, VALUE socket_fd, VALUE fd_to_send) {
0
   struct msghdr msg;
0
   struct iovec vec;
0
   char dummy[1];
0
-	#ifdef __APPLE__
0
+	#if defined(__APPLE__) || defined(__SOLARIS9__)
0
     struct {
0
       struct cmsghdr header;
0
       int fd;
0
@@ -86,7 +79,7 @@ send_fd(VALUE self, VALUE socket_fd, VALUE fd_to_send) {
0
   control_header->cmsg_level = SOL_SOCKET;
0
   control_header->cmsg_type  = SCM_RIGHTS;
0
   control_payload = NUM2INT(fd_to_send);
0
-	#ifdef __APPLE__
0
+	#if defined(__APPLE__) || defined(__SOLARIS9__)
0
     control_header->cmsg_len = sizeof(control_data);
0
     control_data.fd = control_payload;
0
   #else
0
@@ -117,7 +110,7 @@ recv_fd(VALUE self, VALUE socket_fd) {
0
   struct msghdr msg;
0
   struct iovec vec;
0
   char dummy[1];
0
-	#ifdef __APPLE__
0
+	#if defined(__APPLE__) || defined(__SOLARIS9__)
0
     // File descriptor passing macros (CMSG_*) seem to be broken
0
     // on 64-bit MacOS X. This structure works around the problem.
0
     struct {
0
@@ -156,7 +149,7 @@ recv_fd(VALUE self, VALUE socket_fd) {
0
     rb_sys_fail("No valid file descriptor received.");
0
     return Qnil;
0
   }
0
-	#ifdef __APPLE__
0
+	#if defined(__APPLE__) || defined(__SOLARIS9__)
0
     return INT2NUM(control_data.fd);
0
   #else
0
     return INT2NUM(*((int *) CMSG_DATA(control_header)));