changeset 41358:f2c5e3cc1848

8164011: --patch-module support for CDS Summary: exports the ZIP_FreeEntry function Reviewed-by: iklam, dcubed, lfoltan
author ccheung
date Tue, 20 Sep 2016 10:37:32 -0700
parents 064c4150b0ee
children 23b0a20c3e3c
files jdk/make/lib/CoreLibraries.gmk jdk/make/mapfiles/libzip/mapfile-vers jdk/src/java.base/share/native/libzip/zip_util.c jdk/src/java.base/share/native/libzip/zip_util.h
diffstat 4 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/make/lib/CoreLibraries.gmk	Fri Sep 16 13:15:02 2016 -0700
+++ b/jdk/make/lib/CoreLibraries.gmk	Tue Sep 20 10:37:32 2016 -0700
@@ -218,7 +218,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_CRC32, \
+        -export:ZIP_InflateFully -export:ZIP_CRC32 -export:ZIP_FreeEntry, \
     LIBS_unix := -ljvm -ljava $(LIBZ), \
     LIBS_solaris := -lc, \
     LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \
--- a/jdk/make/mapfiles/libzip/mapfile-vers	Fri Sep 16 13:15:02 2016 -0700
+++ b/jdk/make/mapfiles/libzip/mapfile-vers	Tue Sep 20 10:37:32 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -49,6 +49,7 @@
 		Java_java_util_zip_Inflater_setDictionary;
 		ZIP_Close;
 		ZIP_CRC32;
+		ZIP_FreeEntry;
 		ZIP_FindEntry;
 		ZIP_GetEntry;
 		ZIP_GetNextEntry;
--- a/jdk/src/java.base/share/native/libzip/zip_util.c	Fri Sep 16 13:15:02 2016 -0700
+++ b/jdk/src/java.base/share/native/libzip/zip_util.c	Tue Sep 20 10:37:32 2016 -0700
@@ -1094,7 +1094,7 @@
  * jzentry for each zip.  This optimizes a common access pattern.
  */
 
-void
+void JNICALL
 ZIP_FreeEntry(jzfile *jz, jzentry *ze)
 {
     jzentry *last;
--- a/jdk/src/java.base/share/native/libzip/zip_util.h	Fri Sep 16 13:15:02 2016 -0700
+++ b/jdk/src/java.base/share/native/libzip/zip_util.h	Tue Sep 20 10:37:32 2016 -0700
@@ -270,7 +270,8 @@
 void ZIP_Lock(jzfile *zip);
 void ZIP_Unlock(jzfile *zip);
 jint ZIP_Read(jzfile *zip, jzentry *entry, jlong pos, void *buf, jint len);
-void ZIP_FreeEntry(jzfile *zip, jzentry *ze);
+void JNICALL
+ZIP_FreeEntry(jzfile *zip, jzentry *ze);
 jlong ZIP_GetEntryDataOffset(jzfile *zip, jzentry *entry);
 jzentry * ZIP_GetEntry2(jzfile *zip, char *name, jint ulen, jboolean addSlash);