8304717: Declaration aliasing between boolean and jboolean is wrong

Reviewed-by: dholmes
openjdk · Apr 11, 2023 · cd7d53c · cd7d53c · openjdk-notifier · Apr 11, 2023
1 parent 2586f36
commit cd7d53c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/java.base/windows/native/libjli/java_md.c b/src/java.base/windows/native/libjli/java_md.c
@@ -814,7 +814,7 @@ jclass FindBootStrapClass(JNIEnv *env, const char *classname)
 }
 
 void
-InitLauncher(boolean javaw)
+InitLauncher(jboolean javaw)
 {
     INITCOMMONCONTROLSEX icx;
 

diff --git a/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp b/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp
@@ -2637,7 +2637,7 @@ JNIEXPORT jint JNICALL Java_sun_awt_windows_WPrinterJob_getGDIAdvance
  */
 JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_textOut
 (JNIEnv *env, jobject self, jlong printDC, jstring text, jint strLen,
-     boolean glyphCodes, jfloat x, jfloat y, jfloatArray positions)
+     jboolean glyphCodes, jfloat x, jfloat y, jfloatArray positions)
 {
 
     long posX = ROUND_TO_LONG(x);

diff --git a/src/java.prefs/macosx/native/libprefs/MacOSXPreferencesFile.m b/src/java.prefs/macosx/native/libprefs/MacOSXPreferencesFile.m
@@ -659,7 +659,7 @@ static void createTreeForPath(CFStringRef path, CFStringRef name,
 
 
 // child must end with '/'
-JNIEXPORT Boolean JNICALL
+JNIEXPORT jboolean JNICALL
 Java_java_util_prefs_MacOSXPreferencesFile_addChildToNode
 (JNIEnv *env, jobject klass, jobject jpath, jobject jchild,
  jobject jname, jlong juser, jlong jhost)
@@ -682,7 +682,7 @@ static void createTreeForPath(CFStringRef path, CFStringRef name,
     CFDictionaryRef node;
     CFStringRef topKey;
     CFMutableDictionaryRef topValue;
-    Boolean beforeAdd = false;
+    jboolean beforeAdd = JNI_FALSE;
 
     if (!path  ||  !child  ||  !name) goto badparams;
 
@@ -692,12 +692,12 @@ static void createTreeForPath(CFStringRef path, CFStringRef name,
     // copyMutableNode creates the node if necessary
     parent = copyMutableNode(path, name, user, host, &topKey, &topValue);
     throwIfNull(parent, "copyMutableNode failed");
-    beforeAdd = CFDictionaryContainsKey(parent, child);
+    beforeAdd = CFDictionaryContainsKey(parent, child) ? JNI_TRUE : JNI_FALSE;
     CFDictionaryAddValue(parent, child, node);
     if (!beforeAdd)
-        beforeAdd = CFDictionaryContainsKey(parent, child);
+        beforeAdd = CFDictionaryContainsKey(parent, child) ? JNI_TRUE : JNI_FALSE;
     else
-        beforeAdd = false;
+        beforeAdd = JNI_FALSE;
     CFPreferencesSetValue(topKey, topValue, name, user, host);
 
     CFRelease(parent);