diff options
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch b/recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch index bd6c38d..244d2b4 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From b4e7774c35cf29aaca2bd04d115afc3ea3c77d7a Mon Sep 17 00:00:00 2001 | 1 | From dcf3e46758fa5e77ce6fb4b3f51867bb5186f8f0 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Fri, 2 Mar 2018 11:13:08 +0000 | 3 | Date: Fri, 2 Mar 2018 11:13:08 +0000 |
4 | Subject: [PATCH 2001/2009] jdk: comparison between pointer and integer | 4 | Subject: [PATCH] jdk: comparison between pointer and integer |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -21,14 +21,15 @@ Upstream-Status: Backport [http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/90c64359 | |||
21 | 21 | ||
22 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 22 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
23 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 23 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
24 | |||
24 | --- | 25 | --- |
25 | src/share/native/java/net/net_util.c | 15 +++++++-------- | 26 | jdk/src/share/native/java/net/net_util.c | 15 +++++++-------- |
26 | src/share/native/java/net/net_util.h | 8 ++++---- | 27 | jdk/src/share/native/java/net/net_util.h | 8 ++++---- |
27 | src/solaris/native/java/net/Inet6AddressImpl.c | 4 ++-- | 28 | .../solaris/native/java/net/Inet6AddressImpl.c | 4 ++-- |
28 | 3 files changed, 13 insertions(+), 14 deletions(-) | 29 | 3 files changed, 13 insertions(+), 14 deletions(-) |
29 | 30 | ||
30 | diff --git a/jdk/src/share/native/java/net/net_util.c b/jdk/src/share/native/java/net/net_util.c | 31 | diff --git a/jdk/src/share/native/java/net/net_util.c b/jdk/src/share/native/java/net/net_util.c |
31 | index b1b8223a63..2eee6261ac 100644 | 32 | index b1b8223a..2eee6261 100644 |
32 | --- a/jdk/src/share/native/java/net/net_util.c | 33 | --- a/jdk/src/share/native/java/net/net_util.c |
33 | +++ b/jdk/src/share/native/java/net/net_util.c | 34 | +++ b/jdk/src/share/native/java/net/net_util.c |
34 | @@ -108,7 +108,7 @@ jobject getInet6Address_scopeifname(JNIEnv *env, jobject iaObj) { | 35 | @@ -108,7 +108,7 @@ jobject getInet6Address_scopeifname(JNIEnv *env, jobject iaObj) { |
@@ -99,7 +100,7 @@ index b1b8223a63..2eee6261ac 100644 | |||
99 | int scope; | 100 | int scope; |
100 | 101 | ||
101 | diff --git a/jdk/src/share/native/java/net/net_util.h b/jdk/src/share/native/java/net/net_util.h | 102 | diff --git a/jdk/src/share/native/java/net/net_util.h b/jdk/src/share/native/java/net/net_util.h |
102 | index c8a5e68c49..176ca586ee 100644 | 103 | index c8a5e68c..176ca586 100644 |
103 | --- a/jdk/src/share/native/java/net/net_util.h | 104 | --- a/jdk/src/share/native/java/net/net_util.h |
104 | +++ b/jdk/src/share/native/java/net/net_util.h | 105 | +++ b/jdk/src/share/native/java/net/net_util.h |
105 | @@ -64,12 +64,12 @@ JNIEXPORT void JNICALL initInetAddressIDs(JNIEnv *env); | 106 | @@ -64,12 +64,12 @@ JNIEXPORT void JNICALL initInetAddressIDs(JNIEnv *env); |
@@ -120,7 +121,7 @@ index c8a5e68c49..176ca586ee 100644 | |||
120 | extern void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address); | 121 | extern void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address); |
121 | extern void setInetAddress_family(JNIEnv *env, jobject iaObj, int family); | 122 | extern void setInetAddress_family(JNIEnv *env, jobject iaObj, int family); |
122 | diff --git a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c | 123 | diff --git a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c |
123 | index 0a51a365fd..dcc348cf1f 100644 | 124 | index 0a51a365..dcc348cf 100644 |
124 | --- a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c | 125 | --- a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c |
125 | +++ b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c | 126 | +++ b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c |
126 | @@ -392,7 +392,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, | 127 | @@ -392,7 +392,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, |
@@ -141,6 +142,3 @@ index 0a51a365fd..dcc348cf1f 100644 | |||
141 | ret = NULL; | 142 | ret = NULL; |
142 | goto cleanupAndReturn; | 143 | goto cleanupAndReturn; |
143 | } | 144 | } |
144 | -- | ||
145 | 2.26.2 | ||
146 | |||