Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8150456: jdk 9 nightly build fails on Windows 32 bit
authorerikj
Wed, 24 Feb 2016 00:14:23 +0100
changeset 36118 b59ca256a01a
parent 36117 f3e1df22686a
child 36119 75308cd1bf2c
8150456: jdk 9 nightly build fails on Windows 32 bit Reviewed-by: tbell, ihse
jdk/make/lib/CoreLibraries.gmk file | annotate | diff | comparison | revisions
jdk/src/java.base/share/native/libzip/CRC32.c file | annotate | diff | comparison | revisions 
--- a/jdk/make/lib/CoreLibraries.gmk	Tue Feb 23 17:19:28 2016 -0500
+++ b/jdk/make/lib/CoreLibraries.gmk	Wed Feb 24 00:14:23 2016 +0100
@@ -225,7 +225,7 @@
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \
         -export:ZIP_ReadEntry -export:ZIP_GetNextEntry \
-        -export:ZIP_InflateFully, \
+        -export:ZIP_InflateFully -export:ZIP_CRC32, \
     LIBS_unix := -ljvm -ljava $(LIBZ), \
     LIBS_solaris := -lc, \
     LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \
--- a/jdk/src/java.base/share/native/libzip/CRC32.c	Tue Feb 23 17:19:28 2016 -0500
+++ b/jdk/src/java.base/share/native/libzip/CRC32.c	Wed Feb 24 00:14:23 2016 +0100
@@ -54,7 +54,7 @@
     return crc;
 }
 
-JNIEXPORT jint JNICALL
+jint JNICALL
 ZIP_CRC32(jint crc, const jbyte *buf, jint len)
 {
     return crc32(crc, (Bytef*)buf, len);
jdk-sandbox