diff options
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/2004-jdk-use-correct-include-for-poll.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/2004-jdk-use-correct-include-for-poll.patch | 54 |
1 files changed, 26 insertions, 28 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/2004-jdk-use-correct-include-for-poll.patch b/recipes-core/openjdk/patches-openjdk-8/2004-jdk-use-correct-include-for-poll.patch index 365b4d6..91ec91f 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2004-jdk-use-correct-include-for-poll.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2004-jdk-use-correct-include-for-poll.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 48d7384387394820f2f5e8bdc2982c242568b548 Mon Sep 17 00:00:00 2001 | 1 | From 44512cfca65ea5b7b6d1732560d8aa2cd221de22 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: Tue, 27 Feb 2018 09:28:06 +0000 | 3 | Date: Tue, 27 Feb 2018 09:28:06 +0000 |
4 | Subject: [PATCH 2004/2008] jdk: use correct include for poll | 4 | Subject: [PATCH] jdk: use correct include for poll |
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 |
@@ -25,24 +25,25 @@ the following command: | |||
25 | Upstream-Status: Pending | 25 | Upstream-Status: Pending |
26 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 26 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
27 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 27 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
28 | |||
28 | --- | 29 | --- |
29 | src/aix/native/java/net/aix_close.c | 2 +- | 30 | jdk/src/aix/native/java/net/aix_close.c | 2 +- |
30 | src/aix/native/sun/nio/ch/AixPollPort.c | 2 +- | 31 | jdk/src/aix/native/sun/nio/ch/AixPollPort.c | 2 +- |
31 | src/solaris/native/java/net/PlainSocketImpl.c | 2 +- | 32 | jdk/src/solaris/native/java/net/PlainSocketImpl.c | 2 +- |
32 | src/solaris/native/java/net/bsd_close.c | 2 +- | 33 | jdk/src/solaris/native/java/net/bsd_close.c | 2 +- |
33 | src/solaris/native/java/net/linux_close.c | 2 +- | 34 | jdk/src/solaris/native/java/net/linux_close.c | 2 +- |
34 | src/solaris/native/java/net/net_util_md.h | 2 +- | 35 | jdk/src/solaris/native/java/net/net_util_md.h | 2 +- |
35 | src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c | 2 +- | 36 | jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c | 2 +- |
36 | src/solaris/native/sun/nio/ch/Net.c | 2 +- | 37 | jdk/src/solaris/native/sun/nio/ch/Net.c | 2 +- |
37 | src/solaris/native/sun/nio/fs/LinuxWatchService.c | 2 +- | 38 | jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c | 2 +- |
38 | src/solaris/transport/socket/socket_md.c | 2 +- | 39 | jdk/src/solaris/transport/socket/socket_md.c | 2 +- |
39 | 10 files changed, 10 insertions(+), 10 deletions(-) | 40 | 10 files changed, 10 insertions(+), 10 deletions(-) |
40 | 41 | ||
41 | diff --git a/jdk/src/aix/native/java/net/aix_close.c b/jdk/src/aix/native/java/net/aix_close.c | 42 | diff --git a/jdk/src/aix/native/java/net/aix_close.c b/jdk/src/aix/native/java/net/aix_close.c |
42 | index 8c070e4b7..126f4d7d4 100644 | 43 | index 90d57b42..fbeb73ef 100644 |
43 | --- a/jdk/src/aix/native/java/net/aix_close.c | 44 | --- a/jdk/src/aix/native/java/net/aix_close.c |
44 | +++ b/jdk/src/aix/native/java/net/aix_close.c | 45 | +++ b/jdk/src/aix/native/java/net/aix_close.c |
45 | @@ -51,7 +51,7 @@ | 46 | @@ -54,7 +54,7 @@ |
46 | #include <unistd.h> | 47 | #include <unistd.h> |
47 | #include <errno.h> | 48 | #include <errno.h> |
48 | 49 | ||
@@ -52,7 +53,7 @@ index 8c070e4b7..126f4d7d4 100644 | |||
52 | /* | 53 | /* |
53 | * Stack allocated by thread when doing blocking operation | 54 | * Stack allocated by thread when doing blocking operation |
54 | diff --git a/jdk/src/aix/native/sun/nio/ch/AixPollPort.c b/jdk/src/aix/native/sun/nio/ch/AixPollPort.c | 55 | diff --git a/jdk/src/aix/native/sun/nio/ch/AixPollPort.c b/jdk/src/aix/native/sun/nio/ch/AixPollPort.c |
55 | index 70064b890..c10c602b6 100644 | 56 | index 70064b89..c10c602b 100644 |
56 | --- a/jdk/src/aix/native/sun/nio/ch/AixPollPort.c | 57 | --- a/jdk/src/aix/native/sun/nio/ch/AixPollPort.c |
57 | +++ b/jdk/src/aix/native/sun/nio/ch/AixPollPort.c | 58 | +++ b/jdk/src/aix/native/sun/nio/ch/AixPollPort.c |
58 | @@ -34,7 +34,7 @@ | 59 | @@ -34,7 +34,7 @@ |
@@ -65,7 +66,7 @@ index 70064b890..c10c602b6 100644 | |||
65 | #include <fcntl.h> | 66 | #include <fcntl.h> |
66 | #include <stddef.h> | 67 | #include <stddef.h> |
67 | diff --git a/jdk/src/solaris/native/java/net/PlainSocketImpl.c b/jdk/src/solaris/native/java/net/PlainSocketImpl.c | 68 | diff --git a/jdk/src/solaris/native/java/net/PlainSocketImpl.c b/jdk/src/solaris/native/java/net/PlainSocketImpl.c |
68 | index 71cbdf8ce..170957e73 100644 | 69 | index 373c5e36..9aafbc09 100644 |
69 | --- a/jdk/src/solaris/native/java/net/PlainSocketImpl.c | 70 | --- a/jdk/src/solaris/native/java/net/PlainSocketImpl.c |
70 | +++ b/jdk/src/solaris/native/java/net/PlainSocketImpl.c | 71 | +++ b/jdk/src/solaris/native/java/net/PlainSocketImpl.c |
71 | @@ -28,7 +28,7 @@ | 72 | @@ -28,7 +28,7 @@ |
@@ -78,10 +79,10 @@ index 71cbdf8ce..170957e73 100644 | |||
78 | #include <netinet/tcp.h> /* Defines TCP_NODELAY, needed for 2.6 */ | 79 | #include <netinet/tcp.h> /* Defines TCP_NODELAY, needed for 2.6 */ |
79 | #include <netinet/in.h> | 80 | #include <netinet/in.h> |
80 | diff --git a/jdk/src/solaris/native/java/net/bsd_close.c b/jdk/src/solaris/native/java/net/bsd_close.c | 81 | diff --git a/jdk/src/solaris/native/java/net/bsd_close.c b/jdk/src/solaris/native/java/net/bsd_close.c |
81 | index af57cef30..64d040887 100644 | 82 | index 89a20707..511ab845 100644 |
82 | --- a/jdk/src/solaris/native/java/net/bsd_close.c | 83 | --- a/jdk/src/solaris/native/java/net/bsd_close.c |
83 | +++ b/jdk/src/solaris/native/java/net/bsd_close.c | 84 | +++ b/jdk/src/solaris/native/java/net/bsd_close.c |
84 | @@ -36,7 +36,7 @@ | 85 | @@ -38,7 +38,7 @@ |
85 | #include <sys/uio.h> | 86 | #include <sys/uio.h> |
86 | #include <unistd.h> | 87 | #include <unistd.h> |
87 | #include <errno.h> | 88 | #include <errno.h> |
@@ -91,10 +92,10 @@ index af57cef30..64d040887 100644 | |||
91 | /* | 92 | /* |
92 | * Stack allocated by thread when doing blocking operation | 93 | * Stack allocated by thread when doing blocking operation |
93 | diff --git a/jdk/src/solaris/native/java/net/linux_close.c b/jdk/src/solaris/native/java/net/linux_close.c | 94 | diff --git a/jdk/src/solaris/native/java/net/linux_close.c b/jdk/src/solaris/native/java/net/linux_close.c |
94 | index 98e1ce098..85fba135f 100644 | 95 | index eacc2afd..159ca132 100644 |
95 | --- a/jdk/src/solaris/native/java/net/linux_close.c | 96 | --- a/jdk/src/solaris/native/java/net/linux_close.c |
96 | +++ b/jdk/src/solaris/native/java/net/linux_close.c | 97 | +++ b/jdk/src/solaris/native/java/net/linux_close.c |
97 | @@ -34,7 +34,7 @@ | 98 | @@ -36,7 +36,7 @@ |
98 | #include <sys/uio.h> | 99 | #include <sys/uio.h> |
99 | #include <unistd.h> | 100 | #include <unistd.h> |
100 | #include <errno.h> | 101 | #include <errno.h> |
@@ -104,7 +105,7 @@ index 98e1ce098..85fba135f 100644 | |||
104 | /* | 105 | /* |
105 | * Stack allocated by thread when doing blocking operation | 106 | * Stack allocated by thread when doing blocking operation |
106 | diff --git a/jdk/src/solaris/native/java/net/net_util_md.h b/jdk/src/solaris/native/java/net/net_util_md.h | 107 | diff --git a/jdk/src/solaris/native/java/net/net_util_md.h b/jdk/src/solaris/native/java/net/net_util_md.h |
107 | index a48446de9..8915b68aa 100644 | 108 | index a48446de..8915b68a 100644 |
108 | --- a/jdk/src/solaris/native/java/net/net_util_md.h | 109 | --- a/jdk/src/solaris/native/java/net/net_util_md.h |
109 | +++ b/jdk/src/solaris/native/java/net/net_util_md.h | 110 | +++ b/jdk/src/solaris/native/java/net/net_util_md.h |
110 | @@ -33,7 +33,7 @@ | 111 | @@ -33,7 +33,7 @@ |
@@ -117,7 +118,7 @@ index a48446de9..8915b68aa 100644 | |||
117 | 118 | ||
118 | 119 | ||
119 | diff --git a/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c b/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c | 120 | diff --git a/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c b/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c |
120 | index 6860a167b..20849dabc 100644 | 121 | index 6860a167..20849dab 100644 |
121 | --- a/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c | 122 | --- a/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c |
122 | +++ b/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c | 123 | +++ b/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c |
123 | @@ -28,7 +28,7 @@ | 124 | @@ -28,7 +28,7 @@ |
@@ -130,7 +131,7 @@ index 6860a167b..20849dabc 100644 | |||
130 | #include <sys/time.h> | 131 | #include <sys/time.h> |
131 | 132 | ||
132 | diff --git a/jdk/src/solaris/native/sun/nio/ch/Net.c b/jdk/src/solaris/native/sun/nio/ch/Net.c | 133 | diff --git a/jdk/src/solaris/native/sun/nio/ch/Net.c b/jdk/src/solaris/native/sun/nio/ch/Net.c |
133 | index 73560ad6c..a3720055c 100644 | 134 | index 73560ad6..a3720055 100644 |
134 | --- a/jdk/src/solaris/native/sun/nio/ch/Net.c | 135 | --- a/jdk/src/solaris/native/sun/nio/ch/Net.c |
135 | +++ b/jdk/src/solaris/native/sun/nio/ch/Net.c | 136 | +++ b/jdk/src/solaris/native/sun/nio/ch/Net.c |
136 | @@ -23,7 +23,7 @@ | 137 | @@ -23,7 +23,7 @@ |
@@ -143,7 +144,7 @@ index 73560ad6c..a3720055c 100644 | |||
143 | #include <sys/socket.h> | 144 | #include <sys/socket.h> |
144 | #include <string.h> | 145 | #include <string.h> |
145 | diff --git a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c b/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c | 146 | diff --git a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c b/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c |
146 | index 375aaa485..7606e9ba8 100644 | 147 | index 375aaa48..7606e9ba 100644 |
147 | --- a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c | 148 | --- a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c |
148 | +++ b/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c | 149 | +++ b/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c |
149 | @@ -32,7 +32,7 @@ | 150 | @@ -32,7 +32,7 @@ |
@@ -156,7 +157,7 @@ index 375aaa485..7606e9ba8 100644 | |||
156 | 157 | ||
157 | #include "sun_nio_fs_LinuxWatchService.h" | 158 | #include "sun_nio_fs_LinuxWatchService.h" |
158 | diff --git a/jdk/src/solaris/transport/socket/socket_md.c b/jdk/src/solaris/transport/socket/socket_md.c | 159 | diff --git a/jdk/src/solaris/transport/socket/socket_md.c b/jdk/src/solaris/transport/socket/socket_md.c |
159 | index 33e062e08..819fcabdb 100644 | 160 | index 33e062e0..819fcabd 100644 |
160 | --- a/jdk/src/solaris/transport/socket/socket_md.c | 161 | --- a/jdk/src/solaris/transport/socket/socket_md.c |
161 | +++ b/jdk/src/solaris/transport/socket/socket_md.c | 162 | +++ b/jdk/src/solaris/transport/socket/socket_md.c |
162 | @@ -37,7 +37,7 @@ | 163 | @@ -37,7 +37,7 @@ |
@@ -168,6 +169,3 @@ index 33e062e08..819fcabdb 100644 | |||
168 | #endif | 169 | #endif |
169 | 170 | ||
170 | #include "socket_md.h" | 171 | #include "socket_md.h" |
171 | -- | ||
172 | 2.24.1 | ||
173 | |||