java-scratchspace/openjdk7-boot/fix-sysctl-include.patch

61 lines
2.5 KiB
Diff
Raw Normal View History

diff -Naur openjdk.orig/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c openjdk/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c
--- openjdk.orig/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2021-02-07 13:24:53.826116012 +0100
+++ openjdk/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2021-02-07 13:27:45.694119005 +0100
@@ -33,7 +33,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#if defined(_ALLBSD_SOURCE)
-#include <sys/sysctl.h>
+#include <linux/sysctl.h>
#ifdef __APPLE__
#include <sys/param.h>
#include <sys/mount.h>
diff -Naur openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
--- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2021-02-07 13:24:53.827116012 +0100
+++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2021-02-07 13:25:08.863116273 +0100
@@ -41,7 +41,7 @@
#endif
#ifdef __linux__
#include <unistd.h>
-#include <sys/sysctl.h>
+#include <linux/sysctl.h>
#include <sys/utsname.h>
#include <netinet/ip.h>
diff -Naur openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
--- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2021-02-07 13:24:53.827116012 +0100
+++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2021-02-07 13:27:04.998118296 +0100
@@ -43,7 +43,7 @@
#endif
#ifdef __linux__
#include <unistd.h>
-#include <sys/sysctl.h>
+#include <linux/sysctl.h>
#endif
#include "jvm.h"
diff -Naur openjdk.orig/jdk/src/solaris/native/java/net/net_util_md.c openjdk/jdk/src/solaris/native/java/net/net_util_md.c
--- openjdk.orig/jdk/src/solaris/native/java/net/net_util_md.c 2021-02-07 13:24:53.827116012 +0100
+++ openjdk/jdk/src/solaris/native/java/net/net_util_md.c 2021-02-07 13:26:33.754117752 +0100
@@ -40,7 +40,7 @@
#else
#include <limits.h>
#include <sys/param.h>
-#include <sys/sysctl.h>
+#include <linux/sysctl.h>
#ifndef MAXINT
#define MAXINT INT_MAX
#endif
diff -Naur openjdk.orig/jdk/src/solaris/native/sun/net/portconfig.c openjdk/jdk/src/solaris/native/sun/net/portconfig.c
--- openjdk.orig/jdk/src/solaris/native/sun/net/portconfig.c 2021-02-07 13:24:53.831116012 +0100
+++ openjdk/jdk/src/solaris/native/sun/net/portconfig.c 2021-02-07 13:26:05.173117254 +0100
@@ -29,7 +29,7 @@
#include <errno.h>
#if defined(_ALLBSD_SOURCE)
-#include <sys/sysctl.h>
+#include <linux/sysctl.h>
#endif
#include "jni.h"