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?)
108 lines
2.9 KiB
Diff
108 lines
2.9 KiB
Diff
--- src/jdk.orig/src/share/native/com/sun/java/util/jar/pack/zip.cpp
|
|
+++ src/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
|
|
@@ -46,6 +46,8 @@
|
|
|
|
#include "zip.h"
|
|
|
|
+#define uchar unsigned char
|
|
+
|
|
#ifdef NO_ZLIB
|
|
|
|
inline bool jar::deflate_bytes(bytes& head, bytes& tail) {
|
|
--- src/jdk.orig/src/share/native/com/sun/java/util/jar/pack/zip.h
|
|
+++ src/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
|
|
@@ -23,9 +23,7 @@
|
|
* questions.
|
|
*/
|
|
|
|
-#define ushort unsigned short
|
|
-#define uint unsigned int
|
|
-#define uchar unsigned char
|
|
+#include <sys/types.h>
|
|
|
|
struct unpacker;
|
|
|
|
--- src/jdk.orig/src/share/native/sun/awt/medialib/mlib_types.h
|
|
+++ src/jdk/src/share/native/sun/awt/medialib/mlib_types.h
|
|
@@ -27,6 +27,7 @@
|
|
#ifndef MLIB_TYPES_H
|
|
#define MLIB_TYPES_H
|
|
|
|
+#include <stddef.h> /* for NULL */
|
|
#include <limits.h>
|
|
#if defined(_MSC_VER)
|
|
#include <float.h> /* for FLT_MAX and DBL_MAX */
|
|
--- src/jdk.orig/src/solaris/native/java/net/Inet4AddressImpl.c
|
|
+++ src/jdk/src/solaris/native/java/net/Inet4AddressImpl.c
|
|
@@ -47,7 +47,7 @@
|
|
|
|
#include "java_net_Inet4AddressImpl.h"
|
|
|
|
-#if defined(__GLIBC__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 601104))
|
|
+#if defined(__linux__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 601104))
|
|
#define HAS_GLIBC_GETHOSTBY_R 1
|
|
#endif
|
|
|
|
--- src/jdk.orig/src/solaris/native/java/net/NetworkInterface.c
|
|
+++ src/jdk/src/solaris/native/java/net/NetworkInterface.c
|
|
@@ -47,7 +47,6 @@
|
|
|
|
#ifdef __linux__
|
|
#include <sys/ioctl.h>
|
|
-#include <bits/ioctls.h>
|
|
#include <sys/utsname.h>
|
|
#include <stdio.h>
|
|
#endif
|
|
--- src/jdk.orig/src/solaris/native/java/net/PlainDatagramSocketImpl.c
|
|
+++ src/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
|
|
@@ -35,7 +35,6 @@
|
|
#endif
|
|
#ifdef __linux__
|
|
#include <unistd.h>
|
|
-#include <sys/sysctl.h>
|
|
#include <sys/utsname.h>
|
|
#include <netinet/ip.h>
|
|
|
|
--- src/jdk.orig/src/solaris/native/java/net/PlainSocketImpl.c
|
|
+++ src/jdk/src/solaris/native/java/net/PlainSocketImpl.c
|
|
@@ -43,7 +43,6 @@
|
|
#endif
|
|
#ifdef __linux__
|
|
#include <unistd.h>
|
|
-#include <sys/sysctl.h>
|
|
#endif
|
|
|
|
#include "jvm.h"
|
|
--- src/jdk.orig/src/solaris/native/java/net/linux_close.c
|
|
+++ src/jdk/src/solaris/native/java/net/linux_close.c
|
|
@@ -56,7 +56,7 @@
|
|
/*
|
|
* Signal to unblock thread
|
|
*/
|
|
-static int sigWakeup = (__SIGRTMAX - 2);
|
|
+static int sigWakeup;
|
|
|
|
/*
|
|
* The fd table and the number of file descriptors
|
|
@@ -95,6 +95,9 @@
|
|
/*
|
|
* Setup the signal handler
|
|
*/
|
|
+#ifndef __AIX
|
|
+ sigWakeup = SIGRTMAX - 2;
|
|
+#endif
|
|
sa.sa_handler = sig_wakeup;
|
|
sa.sa_flags = 0;
|
|
sigemptyset(&sa.sa_mask);
|
|
--- src/jdk.orig/src/solaris/native/sun/nio/ch/NativeThread.c
|
|
+++ src/jdk/src/solaris/native/sun/nio/ch/NativeThread.c
|
|
@@ -36,7 +36,7 @@
|
|
#include <pthread.h>
|
|
#include <sys/signal.h>
|
|
/* Also defined in net/linux_close.c */
|
|
- #define INTERRUPT_SIGNAL (__SIGRTMAX - 2)
|
|
+ #define INTERRUPT_SIGNAL (SIGRTMAX - 2)
|
|
#elif __solaris__
|
|
#include <thread.h>
|
|
#include <signal.h>
|