ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-01 02:36:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix Linux openjdk build regression

Browse Source
This commit is contained in:
Joel Dice 2016-01-13 08:14:22 -07:00
parent 80dc32094f
commit e169d683c4
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openjdk-patches/Inet6AddressImpl.c.8.patch
View File

@ -1,14 +1,16 @@
--- openjdk/Inet6AddressImpl.c --- openjdk/Inet6AddressImpl.c
+++ openjdk/Inet6AddressImpl.c +++ openjdk/Inet6AddressImpl.c
@@ -360,6 +360,11 @@ @@ -360,6 +360,13 @@
#ifdef AF_INET6 #ifdef AF_INET6
+#ifdef __MINGW32__
+typedef struct icmpv6_echo_reply_lh { +typedef struct icmpv6_echo_reply_lh {
+ IPV6_ADDRESS_EX Address; + IPV6_ADDRESS_EX Address;
+ ULONG Status; + ULONG Status;
+ unsigned int RoundTripTime; + unsigned int RoundTripTime;
+} ICMPV6_ECHO_REPLY, *PICMPV6_ECHO_REPLY; +} ICMPV6_ECHO_REPLY, *PICMPV6_ECHO_REPLY;
+#endif
/** /**
* ping implementation. * ping implementation.

5
openjdk-src.mk
View File

@ -314,6 +314,11 @@ else
sun.nio.ch.InheritedChannel \ sun.nio.ch.InheritedChannel \
sun.nio.fs.UnixNativeDispatcher \ sun.nio.fs.UnixNativeDispatcher \
ifneq (7,$(openjdk-version))
openjdk-headers-classes += \
jdk.net.SocketFlow
endif
openjdk-cflags += \ openjdk-cflags += \
"-I$(openjdk-src)/solaris/javavm/export" \ "-I$(openjdk-src)/solaris/javavm/export" \
"-I$(openjdk-src)/solaris/native/common" \ "-I$(openjdk-src)/solaris/native/common" \