2020-06-26 07:45:43 +00:00
|
|
|
diff -urEbwB openjdk.orig/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h openjdk/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h
|
|
|
|
|
--- openjdk.orig/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h 2020-06-26 09:42:59.047804301 +0200
|
|
|
|
|
+++ openjdk/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h 2020-06-26 09:43:05.211851045 +0200
|
|
|
|
|
@@ -265,6 +265,6 @@
|
|
|
|
|
typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR;
|
|
|
|
|
|
|
|
|
|
/* global GSS function table */
|
|
|
|
|
-GSS_FUNCTION_TABLE_PTR ftab;
|
|
|
|
|
+extern GSS_FUNCTION_TABLE_PTR ftab;
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
diff -urEbwB openjdk.orig/openj9/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c openjdk/openj9/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c
|
|
|
|
|
--- openjdk.orig/openj9/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c 2020-06-26 09:43:37.492095839 +0200
|
|
|
|
|
+++ openjdk/openj9/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c 2020-06-26 09:41:42.243256411 +0200
|
|
|
|
|
@@ -31,7 +31,7 @@
|
2020-06-26 06:31:10 +00:00
|
|
|
static jvmtiExtensionFunction subscribe = NULL;
|
|
|
|
|
static jvmtiExtensionFunction unsubscribe = NULL;
|
|
|
|
|
|
|
|
|
|
-void *subscriptionID;
|
|
|
|
|
+void *subscriptionID1;
|
|
|
|
|
volatile static jint bufferCount = 0;
|
|
|
|
|
volatile static int alarmed = 0;
|
|
|
|
|
|
2020-06-26 07:45:43 +00:00
|
|
|
@@ -131,7 +131,7 @@
|
2020-06-26 06:31:10 +00:00
|
|
|
jvmtiError err;
|
|
|
|
|
jvmtiEnv *jvmti_env = env->jvmtiEnv;
|
|
|
|
|
|
|
|
|
|
- err = subscribe(jvmti_env, "vgc001 subscriber", vgc001Callback, vgc001Alarm, NULL, &subscriptionID);
|
|
|
|
|
+ err = subscribe(jvmti_env, "vgc001 subscriber", vgc001Callback, vgc001Alarm, NULL, &subscriptionID1);
|
|
|
|
|
if (err != JVMTI_ERROR_NONE) {
|
|
|
|
|
error(env, err, "RegisterVerboseGCSubscriber failed");
|
|
|
|
|
return FALSE;
|
2020-06-26 07:45:43 +00:00
|
|
|
@@ -147,7 +147,7 @@
|
2020-06-26 06:31:10 +00:00
|
|
|
jvmtiError err = JVMTI_ERROR_NONE;
|
|
|
|
|
jvmtiEnv *jvmti_env = env->jvmtiEnv;
|
|
|
|
|
|
|
|
|
|
- err = unsubscribe(jvmti_env, subscriptionID, NULL);
|
|
|
|
|
+ err = unsubscribe(jvmti_env, subscriptionID1, NULL);
|
|
|
|
|
if (err != JVMTI_ERROR_NONE && err != JVMTI_ERROR_NOT_AVAILABLE) {
|
|
|
|
|
error(env, err, "DeregisterVerboseGCSubscriber failed");
|
|
|
|
|
return -1;
|
