changeset 9916:c38547f67f44

. Fix missed merges for NIO. Submitted by: Jung-uk Kim (jkim@FreeBSD.org)
author Greg Lewis <glewis@eyesbeyond.com>
date Wed, 12 Nov 2014 23:45:24 -0800
parents c89c1cfbd363
children 2880c1ff291b
files make/lib/NioLibraries.gmk make/mapfiles/libnio/mapfile-bsd
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/make/lib/NioLibraries.gmk	Wed Nov 05 12:14:24 2014 -0800
+++ b/make/lib/NioLibraries.gmk	Wed Nov 12 23:45:24 2014 -0800
@@ -79,6 +79,7 @@
 
 ifeq ($(OPENJDK_TARGET_OS), bsd)
   BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
+  BUILD_LIBNIO_SRC += $(JDK_TOPDIR)/src/bsd/native/sun/nio/ch
   BUILD_LIBNIO_FILES += \
       BsdNativeDispatcher.c \
       GnomeFileTypeDetector.c \
--- a/make/mapfiles/libnio/mapfile-bsd	Wed Nov 05 12:14:24 2014 -0800
+++ b/make/mapfiles/libnio/mapfile-bsd	Wed Nov 12 23:45:24 2014 -0800
@@ -112,6 +112,12 @@
 		Java_sun_nio_ch_Net_localInetAddress;
 		Java_sun_nio_ch_Net_localPort;
 		Java_sun_nio_ch_Net_poll;
+		Java_sun_nio_ch_Net_pollconnValue;
+		Java_sun_nio_ch_Net_pollerrValue;
+		Java_sun_nio_ch_Net_pollhupValue;
+		Java_sun_nio_ch_Net_pollinValue;
+		Java_sun_nio_ch_Net_pollnvalValue;
+		Java_sun_nio_ch_Net_polloutValue;
 		Java_sun_nio_ch_Net_setIntOption0;
 		Java_sun_nio_ch_Net_setInterface4;
 		Java_sun_nio_ch_Net_setInterface6;