The current version of jdk/src/java.base/share/native/include/jni.h differs in trivial ways from hotspot/src/share/vm/prims/jni.h. These files ought to be identical (and see related JDK-8167078). I think the hotspot version is the intended "master" copy.
{noformat}
diff ../jdk/src/java.base/share/native/include/jni.h src/share/vm/prims/jni.h
2c2
< * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
---
> * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
775c775
< (JNIEnv* env, jobject m1, jobject m2);
---
> (JNIEnv* env, jobject m1, jobject m2);
778c778
< (JNIEnv* env, jobject m1, jobject m2);
---
> (JNIEnv* env, jobject m1, jobject m2);
1877,1878c1877,1878
< void AddModuleReads(jobject m1, jobject m2) {
< functions->AddModuleReads(this, m1, m2);
---
> void AddModuleReads(jobject fromModule, jobject sourceModule) {
> functions->AddModuleReads(this, fromModule, sourceModule);
1881,1882c1881,1882
< jboolean CanReadModule(jobject m1, jobject m2) {
< return functions->CanReadModule(this, m1, m2);
---
> jboolean CanReadModule(jobject askingModule, jobject sourceModule) {
> return functions->CanReadModule(this, askingModule, sourceModule);
{noformat}
{noformat}
diff ../jdk/src/java.base/share/native/include/jni.h src/share/vm/prims/jni.h
2c2
< * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
---
> * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
775c775
< (JNIEnv* env, jobject m1, jobject m2);
---
> (JNIEnv* env, jobject m1, jobject m2);
778c778
< (JNIEnv* env, jobject m1, jobject m2);
---
> (JNIEnv* env, jobject m1, jobject m2);
1877,1878c1877,1878
< void AddModuleReads(jobject m1, jobject m2) {
< functions->AddModuleReads(this, m1, m2);
---
> void AddModuleReads(jobject fromModule, jobject sourceModule) {
> functions->AddModuleReads(this, fromModule, sourceModule);
1881,1882c1881,1882
< jboolean CanReadModule(jobject m1, jobject m2) {
< return functions->CanReadModule(this, m1, m2);
---
> jboolean CanReadModule(jobject askingModule, jobject sourceModule) {
> return functions->CanReadModule(this, askingModule, sourceModule);
{noformat}
- relates to
-
JDK-8167078 Duplicate header files in hotspot and jdk
-
- Resolved
-