mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-10-21 12:21:43 +02:00
166ad0377b
ref #4515 openjdk8 and openjdk7 cannot coexist currently due to automatic so dependencies. both packages should be fixed to not provide conflicting so deps (or maybe needs abuild change?)
155 lines
4.0 KiB
Diff
155 lines
4.0 KiB
Diff
--- src/jdk.orig/src/aix/native/java/net/aix_close.c
|
|
+++ src/jdk/src/aix/native/java/net/aix_close.c
|
|
@@ -50,7 +50,7 @@
|
|
#include <unistd.h>
|
|
#include <errno.h>
|
|
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
|
|
/*
|
|
* Stack allocated by thread when doing blocking operation
|
|
--- src/jdk.orig/src/aix/native/sun/nio/ch/AixNativeThread.c
|
|
+++ src/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c
|
|
@@ -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)
|
|
--- src/jdk.orig/src/aix/native/sun/nio/ch/AixPollPort.c
|
|
+++ src/jdk/src/aix/native/sun/nio/ch/AixPollPort.c
|
|
@@ -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>
|
|
--- src/jdk.orig/src/macosx/javavm/export/jvm_md.h
|
|
+++ src/jdk/src/macosx/javavm/export/jvm_md.h
|
|
@@ -60,7 +60,7 @@
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
#include <errno.h>
|
|
-#include <sys/signal.h>
|
|
+#include <signal.h>
|
|
|
|
/* O Flags */
|
|
|
|
--- src/jdk.orig/src/solaris/javavm/export/jvm_md.h
|
|
+++ src/jdk/src/solaris/javavm/export/jvm_md.h
|
|
@@ -65,7 +65,7 @@
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
#include <errno.h>
|
|
-#include <sys/signal.h>
|
|
+#include <signal.h>
|
|
|
|
/* O Flags */
|
|
|
|
--- src/jdk.orig/src/solaris/native/java/net/PlainSocketImpl.c
|
|
+++ src/jdk/src/solaris/native/java/net/PlainSocketImpl.c
|
|
@@ -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>
|
|
--- src/jdk.orig/src/solaris/native/java/net/bsd_close.c
|
|
+++ src/jdk/src/solaris/native/java/net/bsd_close.c
|
|
@@ -36,7 +36,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
|
|
--- src/jdk.orig/src/solaris/native/java/net/linux_close.c
|
|
+++ src/jdk/src/solaris/native/java/net/linux_close.c
|
|
@@ -34,7 +34,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
|
|
--- src/jdk.orig/src/solaris/native/java/net/net_util_md.h
|
|
+++ src/jdk/src/solaris/native/java/net/net_util_md.h
|
|
@@ -33,7 +33,7 @@
|
|
#include <unistd.h>
|
|
|
|
#ifndef USE_SELECT
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#endif
|
|
|
|
|
|
--- src/jdk.orig/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c
|
|
+++ src/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c
|
|
@@ -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>
|
|
|
|
--- src/jdk.orig/src/solaris/native/sun/nio/ch/NativeThread.c
|
|
+++ src/jdk/src/solaris/native/sun/nio/ch/NativeThread.c
|
|
@@ -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__
|
|
--- src/jdk.orig/src/solaris/native/sun/nio/ch/Net.c
|
|
+++ src/jdk/src/solaris/native/sun/nio/ch/Net.c
|
|
@@ -23,7 +23,7 @@
|
|
* questions.
|
|
*/
|
|
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <string.h>
|
|
--- src/jdk.orig/src/solaris/native/sun/nio/fs/LinuxWatchService.c
|
|
+++ src/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c
|
|
@@ -32,7 +32,7 @@
|
|
#include <dlfcn.h>
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#include <sys/inotify.h>
|
|
|
|
#include "sun_nio_fs_LinuxWatchService.h"
|
|
--- src/jdk.orig/src/solaris/transport/socket/socket_md.c
|
|
+++ src/jdk/src/solaris/transport/socket/socket_md.c
|
|
@@ -37,7 +37,7 @@
|
|
#include <thread.h>
|
|
#else
|
|
#include <pthread.h>
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#endif
|
|
|
|
#include "socket_md.h"
|