diff src/share/vm/prims/jvm.h @ 11198:1e6d5dec4a4e

Merge.
author Christian Humer <christian.humer@gmail.com>
date Mon, 05 Aug 2013 13:20:06 +0200
parents e636d62005c3
children 096c224171c4
line wrap: on
line diff
--- a/src/share/vm/prims/jvm.h	Thu Aug 01 21:34:57 2013 +0200
+++ b/src/share/vm/prims/jvm.h	Mon Aug 05 13:20:06 2013 +0200
@@ -471,11 +471,13 @@
 JNIEXPORT jobject JNICALL
 JVM_GetProtectionDomain(JNIEnv *env, jclass cls);
 
+JNIEXPORT jboolean JNICALL
+JVM_IsArrayClass(JNIEnv *env, jclass cls);
+
+// Preserved in Graal repo so that linking against a JDK7 libjava.so works
 JNIEXPORT void JNICALL
 JVM_SetProtectionDomain(JNIEnv *env, jclass cls, jobject protection_domain);
 
-JNIEXPORT jboolean JNICALL
-JVM_IsArrayClass(JNIEnv *env, jclass cls);
 
 JNIEXPORT jboolean JNICALL
 JVM_IsPrimitiveClass(JNIEnv *env, jclass cls);