stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8304717: Declaration aliasing between boolean and jboolean is wrong

Browse Source 
Reviewed-by: dholmes
This commit is contained in:
Julian Waters 2023-04-11 06:52:34 +00:00
parent 2586f36120
commit cd7d53c88c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java.base/windows/native/libjli/java_md.c
View File

@ -814,7 +814,7 @@ jclass FindBootStrapClass(JNIEnv *env, const char *classname)
} }
void void
InitLauncher(boolean javaw) InitLauncher(jboolean javaw)
{ {
INITCOMMONCONTROLSEX icx; INITCOMMONCONTROLSEX icx;

2
src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp
View File

@ -2637,7 +2637,7 @@ JNIEXPORT jint JNICALL Java_sun_awt_windows_WPrinterJob_getGDIAdvance
*/ */
JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_textOut JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_textOut
(JNIEnv *env, jobject self, jlong printDC, jstring text, jint strLen, (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); long posX = ROUND_TO_LONG(x);

10
src/java.prefs/macosx/native/libprefs/MacOSXPreferencesFile.m
View File

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