From 757d8427ea61ce57ac7530c0f12512d9b382610f Mon Sep 17 00:00:00 2001 From: Carsten Elton Sorensen Date: Tue, 5 Feb 2013 11:36:09 +0100 Subject: [PATCH] Add missing classes for Windows XP --- openjdk-src.mk | 5 +++++ openjdk.pro | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/openjdk-src.mk b/openjdk-src.mk index fbbce2e5e8..f588f471a8 100644 --- a/openjdk-src.mk +++ b/openjdk-src.mk @@ -196,6 +196,8 @@ ifeq ($(platform),windows) $(openjdk-src)/windows/native/java/net/NetworkInterface_winXP.c \ $(openjdk-src)/windows/native/java/net/SocketInputStream.c \ $(openjdk-src)/windows/native/java/net/SocketOutputStream.c \ + $(openjdk-src)/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c \ + $(openjdk-src)/windows/native/java/net/TwoStacksPlainSocketImpl.c \ $(openjdk-src)/windows/native/java/util/WindowsPreferences.c \ $(openjdk-src)/windows/native/java/util/logging.c \ $(openjdk-src)/windows/native/java/util/TimeZone_md.c \ @@ -216,6 +218,9 @@ ifeq ($(platform),windows) openjdk-headers-classes += \ java.net.DualStackPlainSocketImpl \ + java.net.SocketImpl \ + java.net.TwoStacksPlainDatagramSocketImpl \ + java.net.TwoStacksPlainSocketImpl \ java.lang.ProcessImpl \ sun.io.Win32ErrorMode \ sun.nio.ch.WindowsSelectorImpl \ diff --git a/openjdk.pro b/openjdk.pro index 69b4646090..71bc20aadd 100644 --- a/openjdk.pro +++ b/openjdk.pro @@ -141,6 +141,24 @@ ; } +-keepclassmembers class java.net.TwoStacksPlainSocketImpl { + *** fd1; + *** lastfd; +} + +-keepclassmembers class java.net.AbstractPlainSocketImpl { + *** timeout; + *** trafficClass; +} + +-keepclassmembers class java.net.SocketImpl { + *** serverSocket; + *** fd; + *** address; + *** port; + *** localport; +} + -keepclassmembers class java.io.FileInputStream { private java.io.FileDescriptor fd; }