infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-16 10:53:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

8196879: Forgot to add file in JDK-8196803

Browse Source 
Reviewed-by: tbell
This commit is contained in:
Erik Joelsson 2018-02-06 10:17:31 -08:00
parent ffdfd48fd2
commit 7a6b695959
1 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/java.desktop/macosx/native/libsplashscreen/libpng/zlib.h Normal file
View File

@ -0,0 +1,56 @@
/*
* Copyright (c) 2018, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* This header file is used to hijack the include of "zlib.h" from libpng on
* Macos. We do that to be able to build on macos 10.13 or later, but still
* keep binary compatibility with older versions (as specified to configure).
*
* The problem is that in 10.13, Macos shipped with a newer version of zlib,
* which exports the function inflateValidate. There is a call to this
* function in pngrutil.c, guarded by a preprocessor check of ZLIB_VERNUM being
* high enough. If we compile this call in and link to the newer version of
* zlib, we will get link errors if the code is executed on an older Mac with
* an older version of zlib.
*
* The zlib.h header in Macos has been annotated with Macos specific macros that
* guard these kinds of version specific APIs, but libpng is not using those
* checks in its conditionals, just ZLIB_VERNUM. To fix this, we check for the
* MAC_OS_X_VERSION_MIN_REQUIRED macro here and adjust the ZLIB_VERNUM to the
# known version bundled with that release. This solution is certainly a hack,
* but it seems the affected versions of zlib.h are compatible enough for this
* to work.
*/
#include <zlib.h>
#include <AvailabilityMacros.h>
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12
# undef ZLIB_VERNUM
# define ZLIB_VERNUM 0x1250
#elif MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_13
# undef ZLIB_VERNUM
# define ZLIB_VERNUM 0x1280
#endif