stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8150456: jdk 9 nightly build fails on Windows 32 bit

Browse Source 
Reviewed-by: tbell, ihse
This commit is contained in:
Erik Joelsson 2016-02-24 00:14:23 +01:00
parent aa585fa3cf
commit c542850197
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/make/lib/CoreLibraries.gmk
View File

@ -225,7 +225,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \
$(call SET_SHARED_LIBRARY_ORIGIN), \ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \ LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \
-export:ZIP_ReadEntry -export:ZIP_GetNextEntry \ -export:ZIP_ReadEntry -export:ZIP_GetNextEntry \
-export:ZIP_InflateFully, \ -export:ZIP_InflateFully -export:ZIP_CRC32, \
LIBS_unix := -ljvm -ljava $(LIBZ), \ LIBS_unix := -ljvm -ljava $(LIBZ), \
LIBS_solaris := -lc, \ LIBS_solaris := -lc, \
LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \ LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \

2
jdk/src/java.base/share/native/libzip/CRC32.c
View File

@ -54,7 +54,7 @@ Java_java_util_zip_CRC32_updateBytes0(JNIEnv *env, jclass cls, jint crc,
return crc; return crc;
} }
JNIEXPORT jint JNICALL jint JNICALL
ZIP_CRC32(jint crc, const jbyte *buf, jint len) ZIP_CRC32(jint crc, const jbyte *buf, jint len)
{ {
return crc32(crc, (Bytef*)buf, len); return crc32(crc, (Bytef*)buf, len);