From e169d683c44fd4da827262835a2a57f5259c21b9 Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Wed, 13 Jan 2016 08:14:22 -0700
Subject: [PATCH] fix Linux openjdk build regression

---
 openjdk-patches/Inet6AddressImpl.c.8.patch | 4 +++-
 openjdk-src.mk                             | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/openjdk-patches/Inet6AddressImpl.c.8.patch b/openjdk-patches/Inet6AddressImpl.c.8.patch
index 2beb9763bf..d2994ea21f 100644
--- a/openjdk-patches/Inet6AddressImpl.c.8.patch
+++ b/openjdk-patches/Inet6AddressImpl.c.8.patch
@@ -1,14 +1,16 @@
 --- openjdk/Inet6AddressImpl.c
 +++ openjdk/Inet6AddressImpl.c
-@@ -360,6 +360,11 @@
+@@ -360,6 +360,13 @@
 
  #ifdef AF_INET6
 
++#ifdef __MINGW32__
 +typedef struct icmpv6_echo_reply_lh {
 +  IPV6_ADDRESS_EX Address;
 +  ULONG           Status;
 +  unsigned int    RoundTripTime;
 +} ICMPV6_ECHO_REPLY, *PICMPV6_ECHO_REPLY;
++#endif
 
  /**
    * ping implementation.
diff --git a/openjdk-src.mk b/openjdk-src.mk
index 4c14a0334f..0270de9a4d 100644
--- a/openjdk-src.mk
+++ b/openjdk-src.mk
@@ -314,6 +314,11 @@ else
 		sun.nio.ch.InheritedChannel \
 		sun.nio.fs.UnixNativeDispatcher \
 
+	ifneq (7,$(openjdk-version))
+		openjdk-headers-classes += \
+			jdk.net.SocketFlow
+	endif
+
 	openjdk-cflags += \
 		"-I$(openjdk-src)/solaris/javavm/export" \
 		"-I$(openjdk-src)/solaris/native/common" \