changeset 1466:cd10412684b5

. Adapt to changes in main OpenJDK repository (use of sctp_peeloff).
author glewis@misty.eyesbeyond.com
date Sun, 19 Jul 2009 20:27:02 -0700
parents 0c52ab54a2c7
children 6058ce1924ab
files src/solaris/native/sun/nio/ch/Sctp.h src/solaris/native/sun/nio/ch/SctpNet.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/solaris/native/sun/nio/ch/Sctp.h	Sun Jul 19 20:25:53 2009 -0700
+++ b/src/solaris/native/sun/nio/ch/Sctp.h	Sun Jul 19 20:27:02 2009 -0700
@@ -326,6 +326,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/sctp.h>
+#include <netinet/sctp_peeloff.h>
 #include <netinet/sctp_uio.h>
 #include "jni.h"
 
@@ -347,6 +348,7 @@
 #define nio_sctp_getpaddrs	sctp_getpaddrs
 #define nio_sctp_freepaddrs	sctp_freepaddrs
 #define nio_sctp_bindx		sctp_bindx
+#define nio_sctp_peeloff	sctp_peeloff
 
 #endif
 
--- a/src/solaris/native/sun/nio/ch/SctpNet.c	Sun Jul 19 20:25:53 2009 -0700
+++ b/src/solaris/native/sun/nio/ch/SctpNet.c	Sun Jul 19 20:27:02 2009 -0700
@@ -96,7 +96,6 @@
               dlerror());
         return JNI_FALSE;
     }
-#endif /* __FreeBSD__ */
 
     if ((nio_sctp_peeloff = (sctp_peeloff_func*)
             dlsym(RTLD_DEFAULT, "sctp_peeloff")) == NULL) {
@@ -104,6 +103,7 @@
               dlerror());
         return JNI_FALSE;
     }
+#endif /* __FreeBSD__ */
 
     funcsLoaded = JNI_TRUE;
     return JNI_TRUE;