--- openjdk.orig/jdk/src/aix/native/java/net/aix_close.c +++ openjdk/jdk/src/aix/native/java/net/aix_close.c @@ -62,7 +62,7 @@ #include <unistd.h> #include <errno.h> -#include <sys/poll.h> +#include <poll.h> /* * Stack allocated by thread when doing blocking operation --- openjdk.orig/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c +++ openjdk/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) --- openjdk.orig/jdk/src/aix/native/sun/nio/ch/AixPollPort.c +++ openjdk/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> --- openjdk.orig/jdk/src/macosx/javavm/export/jvm_md.h +++ openjdk/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 */ --- openjdk.orig/jdk/src/solaris/javavm/export/jvm_md.h +++ openjdk/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 */ --- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c +++ openjdk/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> --- openjdk.orig/jdk/src/solaris/native/java/net/bsd_close.c +++ openjdk/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 --- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c +++ openjdk/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 --- openjdk.orig/jdk/src/solaris/native/java/net/net_util_md.h +++ openjdk/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 int NET_Timeout(int s, long timeout); --- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c +++ openjdk/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> --- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/NativeThread.c +++ openjdk/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__ --- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/Net.c +++ openjdk/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> --- openjdk.orig/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c +++ openjdk/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" --- openjdk.orig/jdk/src/solaris/transport/socket/socket_md.c +++ openjdk/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"