--- old/src/jdk.sctp/unix/native/libsctp/Sctp.h 2020-05-20 18:03:39.494288233 -0700 +++ new/src/jdk.sctp/unix/native/libsctp/Sctp.h 2020-05-20 18:03:39.114280937 -0700 @@ -26,48 +26,6 @@ #ifndef SUN_NIO_CH_SCTP_H #define SUN_NIO_CH_SCTP_H -#ifdef __solaris__ - -#define _XPG4_2 -#define __EXTENSIONS__ -#include -#include -#include "jni.h" - -/* Current Solaris headers don't comply with draft rfc */ -#ifndef SCTP_EOF -#define SCTP_EOF MSG_EOF -#endif - -#ifndef SCTP_UNORDERED -#define SCTP_UNORDERED MSG_UNORDERED -#endif - -/* The current version of the socket API extension shipped with Solaris does - * not define the following options that the Java API (optionally) supports */ -#ifndef SCTP_EXPLICIT_EOR -#define SCTP_EXPLICIT_EOR -1 -#endif -#ifndef SCTP_FRAGMENT_INTERLEAVE -#define SCTP_FRAGMENT_INTERLEAVE -1 -#endif -#ifndef SCTP_SET_PEER_PRIMARY_ADDR -#define SCTP_SET_PEER_PRIMARY_ADDR -1 -#endif - -/* Function types to support dynamic linking of socket API extension functions - * for SCTP. This is so that there is no linkage depandancy during build or - * runtime for libsctp.*/ -typedef int sctp_getladdrs_func(int sock, sctp_assoc_t id, void **addrs); -typedef int sctp_freeladdrs_func(void* addrs); -typedef int sctp_getpaddrs_func(int sock, sctp_assoc_t id, void **addrs); -typedef int sctp_freepaddrs_func(void *addrs); -typedef int sctp_bindx_func(int sock, void *addrs, int addrcnt, int flags); -typedef int sctp_peeloff_func(int sock, sctp_assoc_t id); - - - -#else /* __linux__ */ #include #include #include @@ -320,8 +278,6 @@ typedef int sctp_peeloff_func(int sock, sctp_assoc_t id); -#endif /* __linux__ */ - extern sctp_getladdrs_func* nio_sctp_getladdrs; extern sctp_freeladdrs_func* nio_sctp_freeladdrs; extern sctp_getpaddrs_func* nio_sctp_getpaddrs;