< prev index next >

src/java.desktop/macosx/native/libosxui/AquaLookAndFeel.m

Print this page
rev 12879 : 8136556: Add the ability to perform static builds of MacOSX x64 binaries
Reviewed-by: ihse, bdelsart, gadams, lfoltan, rriggs, hseigel, twisti

*** 1,7 **** /* ! * Copyright (c) 2011, 2012, 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 --- 1,7 ---- /* ! * Copyright (c) 2011, 2015, 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
*** 21,35 **** * 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. */ #import <JavaNativeFoundation/JavaNativeFoundation.h> /* * Empty JNI_OnLoad - needed to prevent: * <rdar://4984599> AWT's JNI_OnLoad called multiple times * Please remove when <rdar://5121166> has been resolved. */ ! JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { return JNI_VERSION_1_4; } --- 21,40 ---- * 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. */ + // Must include this before JavaNativeFoundation.h to get jni.h from build + #include "jni.h" + #include "jni_util.h" + #import <JavaNativeFoundation/JavaNativeFoundation.h> /* * Empty JNI_OnLoad - needed to prevent: * <rdar://4984599> AWT's JNI_OnLoad called multiple times * Please remove when <rdar://5121166> has been resolved. */ ! JNIEXPORT jint JNICALL DEF_JNI_OnLoad(JavaVM *vm, void *reserved) ! { return JNI_VERSION_1_4; }
< prev index next >