8304717: Declaration aliasing between boolean and jboolean is wrong
Reviewed-by: dholmes
This commit is contained in:
parent
2586f36120
commit
cd7d53c88c
@ -814,7 +814,7 @@ jclass FindBootStrapClass(JNIEnv *env, const char *classname)
|
||||
}
|
||||
|
||||
void
|
||||
InitLauncher(boolean javaw)
|
||||
InitLauncher(jboolean javaw)
|
||||
{
|
||||
INITCOMMONCONTROLSEX icx;
|
||||
|
||||
|
@ -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);
|
||||
|
@ -659,7 +659,7 @@ Java_java_util_prefs_MacOSXPreferencesFile_removeNode
|
||||
|
||||
|
||||
// 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 @@ Java_java_util_prefs_MacOSXPreferencesFile_addChildToNode
|
||||
CFDictionaryRef node;
|
||||
CFStringRef topKey;
|
||||
CFMutableDictionaryRef topValue;
|
||||
Boolean beforeAdd = false;
|
||||
jboolean beforeAdd = JNI_FALSE;
|
||||
|
||||
if (!path || !child || !name) goto badparams;
|
||||
|
||||
@ -692,12 +692,12 @@ Java_java_util_prefs_MacOSXPreferencesFile_addChildToNode
|
||||
// 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);
|
||||
|
Loading…
Reference in New Issue
Block a user