gentoo-bootstrap/dev-java/openjdk/files/musl/8/0007_musl_jdk_includes.patch

145 lines
6.2 KiB
Diff

diff -Naur openjdk-8.265_p01/jdk/src/aix/native/java/net/aix_close.c openjdk-8.265_p01-copy/jdk/src/aix/native/java/net/aix_close.c
--- openjdk-8.265_p01/jdk/src/aix/native/java/net/aix_close.c 2020-10-11 15:53:09.260010360 -0400
+++ openjdk-8.265_p01-copy/jdk/src/aix/native/java/net/aix_close.c 2020-10-11 21:03:15.540019382 -0400
@@ -54,7 +54,7 @@
#include <unistd.h>
#include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
/*
* Stack allocated by thread when doing blocking operation
diff -Naur openjdk-8.265_p01/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c openjdk-8.265_p01-copy/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c
--- openjdk-8.265_p01/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c 2020-10-11 15:53:09.260010360 -0400
+++ openjdk-8.265_p01-copy/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c 2020-10-11 21:03:39.704019393 -0400
@@ -32,7 +32,7 @@
#include "sun_nio_ch_NativeThread.h"
#include <pthread.h>
-#include <sys/signal.h>
+#include <signal.h>
/* Also defined in src/aix/native/java/net/aix_close.c */
#define INTERRUPT_SIGNAL (SIGRTMAX - 1)
diff -Naur openjdk-8.265_p01/jdk/src/aix/native/sun/nio/ch/AixPollPort.c openjdk-8.265_p01-copy/jdk/src/aix/native/sun/nio/ch/AixPollPort.c
--- openjdk-8.265_p01/jdk/src/aix/native/sun/nio/ch/AixPollPort.c 2020-10-11 15:53:09.260010360 -0400
+++ openjdk-8.265_p01-copy/jdk/src/aix/native/sun/nio/ch/AixPollPort.c 2020-10-11 21:03:55.880019401 -0400
@@ -34,7 +34,7 @@
#include <unistd.h>
#include <sys/types.h>
#include <sys/socket.h>
-#include <sys/poll.h>
+#include <poll.h>
#include <sys/pollset.h>
#include <fcntl.h>
#include <stddef.h>
diff -Naur openjdk-8.265_p01/jdk/src/macosx/javavm/export/jvm_md.h openjdk-8.265_p01-copy/jdk/src/macosx/javavm/export/jvm_md.h
--- openjdk-8.265_p01/jdk/src/macosx/javavm/export/jvm_md.h 2020-10-11 15:53:09.268010360 -0400
+++ openjdk-8.265_p01-copy/jdk/src/macosx/javavm/export/jvm_md.h 2020-10-11 21:04:16.324019411 -0400
@@ -60,7 +60,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <errno.h>
-#include <sys/signal.h>
+#include <signal.h>
/* O Flags */
diff -Naur openjdk-8.265_p01/jdk/src/solaris/javavm/export/jvm_md.h openjdk-8.265_p01-copy/jdk/src/solaris/javavm/export/jvm_md.h
--- openjdk-8.265_p01/jdk/src/solaris/javavm/export/jvm_md.h 2020-10-11 15:53:09.304010360 -0400
+++ openjdk-8.265_p01-copy/jdk/src/solaris/javavm/export/jvm_md.h 2020-10-11 21:04:38.324019422 -0400
@@ -65,7 +65,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <errno.h>
-#include <sys/signal.h>
+#include <signal.h>
/* O Flags */
diff -Naur openjdk-8.265_p01/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk-8.265_p01-copy/jdk/src/solaris/native/java/net/PlainSocketImpl.c
--- openjdk-8.265_p01/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2020-10-11 15:53:09.308010360 -0400
+++ openjdk-8.265_p01-copy/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2020-10-11 21:05:07.272019436 -0400
@@ -28,7 +28,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#if defined(__linux__) && !defined(USE_SELECT)
-#include <sys/poll.h>
+#include <poll.h>
#endif
#include <netinet/tcp.h> /* Defines TCP_NODELAY, needed for 2.6 */
#include <netinet/in.h>
diff -Naur openjdk-8.265_p01/jdk/src/solaris/native/java/net/bsd_close.c openjdk-8.265_p01-copy/jdk/src/solaris/native/java/net/bsd_close.c
--- openjdk-8.265_p01/jdk/src/solaris/native/java/net/bsd_close.c 2020-10-11 15:53:09.308010360 -0400
+++ openjdk-8.265_p01-copy/jdk/src/solaris/native/java/net/bsd_close.c 2020-10-11 21:05:21.300019443 -0400
@@ -38,7 +38,7 @@
#include <sys/uio.h>
#include <unistd.h>
#include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
/*
* Stack allocated by thread when doing blocking operation
diff -Naur openjdk-8.265_p01/jdk/src/solaris/native/java/net/net_util_md.h openjdk-8.265_p01-copy/jdk/src/solaris/native/java/net/net_util_md.h
--- openjdk-8.265_p01/jdk/src/solaris/native/java/net/net_util_md.h 2020-10-11 15:53:09.308010360 -0400
+++ openjdk-8.265_p01-copy/jdk/src/solaris/native/java/net/net_util_md.h 2020-10-11 21:05:34.772019449 -0400
@@ -33,7 +33,7 @@
#include <unistd.h>
#ifndef USE_SELECT
-#include <sys/poll.h>
+#include <poll.h>
#endif
diff -Naur openjdk-8.265_p01/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c openjdk-8.265_p01-copy/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c
--- openjdk-8.265_p01/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c 2020-10-11 15:53:09.316010360 -0400
+++ openjdk-8.265_p01-copy/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c 2020-10-11 21:05:53.824019458 -0400
@@ -28,7 +28,7 @@
#include "jvm.h"
#include "jlong.h"
#include "sun_nio_ch_DevPollArrayWrapper.h"
-#include <sys/poll.h>
+#include <poll.h>
#include <unistd.h>
#include <sys/time.h>
diff -Naur openjdk-8.265_p01/jdk/src/solaris/native/sun/nio/ch/NativeThread.c openjdk-8.265_p01-copy/jdk/src/solaris/native/sun/nio/ch/NativeThread.c
--- openjdk-8.265_p01/jdk/src/solaris/native/sun/nio/ch/NativeThread.c 2020-10-11 15:53:09.316010360 -0400
+++ openjdk-8.265_p01-copy/jdk/src/solaris/native/sun/nio/ch/NativeThread.c 2020-10-11 21:06:07.272019465 -0400
@@ -34,7 +34,7 @@
#ifdef __linux__
#include <pthread.h>
- #include <sys/signal.h>
+ #include <signal.h>
/* Also defined in net/linux_close.c */
#define INTERRUPT_SIGNAL (__SIGRTMAX - 2)
#elif __solaris__
diff -Naur openjdk-8.265_p01/jdk/src/solaris/native/sun/nio/ch/Net.c openjdk-8.265_p01-copy/jdk/src/solaris/native/sun/nio/ch/Net.c
--- openjdk-8.265_p01/jdk/src/solaris/native/sun/nio/ch/Net.c 2020-10-11 15:53:09.316010360 -0400
+++ openjdk-8.265_p01-copy/jdk/src/solaris/native/sun/nio/ch/Net.c 2020-10-11 21:06:25.348019474 -0400
@@ -23,7 +23,7 @@
* questions.
*/
-#include <sys/poll.h>
+#include <poll.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <string.h>
diff -Naur openjdk-8.265_p01/jdk/src/solaris/transport/socket/socket_md.c openjdk-8.265_p01-copy/jdk/src/solaris/transport/socket/socket_md.c
--- openjdk-8.265_p01/jdk/src/solaris/transport/socket/socket_md.c 2020-10-11 15:53:09.316010360 -0400
+++ openjdk-8.265_p01-copy/jdk/src/solaris/transport/socket/socket_md.c 2020-10-11 21:06:44.348019483 -0400
@@ -37,7 +37,7 @@
#include <thread.h>
#else
#include <pthread.h>
-#include <sys/poll.h>
+#include <poll.h>
#endif
#include "socket_md.h"