8232929: Duplicate symbols when building static libraries

Reviewed-by: kcr
openjdk · Oct 24, 2019 · ac71396 · ac71396
1 parent ab6ea3b
commit ac71396
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/modules/javafx.graphics/src/main/native-prism-sw/JNIUtil.c b/modules/javafx.graphics/src/main/native-prism-sw/JNIUtil.c
@@ -49,7 +49,7 @@ initializeFieldIds(jfieldID* dest, JNIEnv* env, jclass classHandle,
     while (fields->name != NULL) {
         *dest = (*env)->GetFieldID(env, classHandle, fields->name,
                                    fields->signature);
-        checkAndClearException(env);
+        prismsw_checkAndClearException(env);
         if (*dest == NULL) {
             retVal = JNI_FALSE;
             break;
@@ -69,7 +69,7 @@ initializeStaticFieldIds(jfieldID* dest, JNIEnv* env, jclass classHandle,
     while (fields->name != NULL) {
         *dest = (*env)->GetStaticFieldID(env, classHandle, fields->name,
                                          fields->signature);
-        checkAndClearException(env);
+        prismsw_checkAndClearException(env);
         if (*dest == NULL) {
             retVal = JNI_FALSE;
             break;
@@ -99,7 +99,7 @@ JNI_ThrowNew(JNIEnv* env, const char* throwable, const char* message) {
 }
 
 jboolean
-checkAndClearException(JNIEnv *env) {
+prismsw_checkAndClearException(JNIEnv *env) {
     if (!(*env)->ExceptionCheck(env)) {
         return JNI_FALSE;
     }

diff --git a/modules/javafx.graphics/src/main/native-prism-sw/JNIUtil.h b/modules/javafx.graphics/src/main/native-prism-sw/JNIUtil.h
@@ -43,6 +43,6 @@ jboolean initializeStaticFieldIds(jfieldID* dest, JNIEnv* env,
 
 void JNI_ThrowNew(JNIEnv* env, const char* throwable, const char* message);
 
-jboolean checkAndClearException(JNIEnv *env);
+jboolean prismsw_checkAndClearException(JNIEnv *env);
 
 #endif
diff --git a/modules/javafx.graphics/src/main/native-prism-sw/JPiscesRenderer.c b/modules/javafx.graphics/src/main/native-prism-sw/JPiscesRenderer.c
@@ -332,7 +332,7 @@ initializeObjectFieldIds(JNIEnv *env,
         classHandle = (*env)->GetObjectClass(env, objectHandle);
     } else if (className != 0) {
         classHandle = (*env)->FindClass(env, className);
-        if (checkAndClearException(env)) return JNI_FALSE;
+        if (prismsw_checkAndClearException(env)) return JNI_FALSE;
     } else {
         return JNI_FALSE;
     }