changeset 38578:1a325ada1672

8157964: Static build of libzip is missing JNI_OnLoad_zip entry point Reviewed-by: sherman
author naoto
date Thu, 26 May 2016 14:44:42 -0700
parents 003898efad7e
children 477f5b3c9973
files jdk/src/java.base/share/native/libzip/zip_util.c
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/java.base/share/native/libzip/zip_util.c	Thu May 26 14:21:09 2016 -0700
+++ b/jdk/src/java.base/share/native/libzip/zip_util.c	Thu May 26 14:44:42 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
@@ -77,6 +77,13 @@
 static jint INITIAL_META_COUNT = 2;   /* initial number of entries in meta name array */
 
 /*
+ * Declare library specific JNI_Onload entry if static build
+ */
+#ifdef STATIC_BUILD
+DEF_STATIC_JNI_OnLoad
+#endif
+
+/*
  * The ZFILE_* functions exist to provide some platform-independence with
  * respect to file access needs.
  */