Mercurial > hg > truffle
comparison src/share/vm/prims/jni.cpp @ 8793:499ccc15bbc8
8005716: Enhance JNI specification to allow support of static JNI libraries in Embedded JREs
Reviewed-by: dlong, alanb, mduigou
author | bpittore |
---|---|
date | Fri, 15 Mar 2013 15:20:40 -0400 |
parents | db9981fd3124 |
children | b9a918201d47 cc32ccaaf47f |
comparison
equal
deleted
inserted
replaced
8724:69ffa4ac9e53 | 8793:499ccc15bbc8 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
3 * Copyright (c) 2012 Red Hat, Inc. | 3 * Copyright (c) 2012 Red Hat, Inc. |
4 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 4 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
5 * | 5 * |
6 * This code is free software; you can redistribute it and/or modify it | 6 * This code is free software; you can redistribute it and/or modify it |
7 * under the terms of the GNU General Public License version 2 only, as | 7 * under the terms of the GNU General Public License version 2 only, as |
90 #endif | 90 #endif |
91 #ifdef TARGET_OS_FAMILY_bsd | 91 #ifdef TARGET_OS_FAMILY_bsd |
92 # include "os_bsd.inline.hpp" | 92 # include "os_bsd.inline.hpp" |
93 #endif | 93 #endif |
94 | 94 |
95 static jint CurrentVersion = JNI_VERSION_1_6; | 95 static jint CurrentVersion = JNI_VERSION_1_8; |
96 | 96 |
97 | 97 |
98 // The DT_RETURN_MARK macros create a scoped object to fire the dtrace | 98 // The DT_RETURN_MARK macros create a scoped object to fire the dtrace |
99 // '-return' probe regardless of the return path is taken out of the function. | 99 // '-return' probe regardless of the return path is taken out of the function. |
100 // Methods that have multiple return paths use this to avoid having to | 100 // Methods that have multiple return paths use this to avoid having to |