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

6677332: incorrect signatures for JNI methods in XWindow.c and XlibWrapper.c

Browse Source 
Int replaced with jint in XWindow.c and WlibWrapper.c, and BOOL replaced with Bool in MouseInfo.c.

Reviewed-by: anthony
This commit is contained in:
Roman Kennke 2008-04-02 17:45:50 +04:00 committed by Oleg Sukhodolsky
parent 4eb04f83d5
commit e95ef5ac21
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/solaris/native/sun/awt/MouseInfo.c
View File

@ -54,7 +54,7 @@ Java_sun_awt_DefaultMouseInfoPeer_fillPointWithCoords(JNIEnv *env, jclass cls,
int i;
int32_t xr, yr, xw, yw;
uint32_t keys;
BOOL pointerFound;
Bool pointerFound;
AWT_LOCK();
if (pointClass == NULL) {
@ -102,7 +102,7 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_DefaultMouseInfoPeer_isWindowUnderMouse
int32_t xr = 0, yr = 0, xw = 0, yw = 0;
uint32_t keys = 0;
uint32_t nchildren = 0;
BOOL pointerFound = 0;
Bool pointerFound = 0;
struct FrameData *wdata = NULL;
jobject winPeer = NULL;

2
jdk/src/solaris/native/sun/xawt/XWindow.c
View File

@ -1234,7 +1234,7 @@ Java_sun_awt_X11_XWindow_initIDs
}
}
JNIEXPORT int JNICALL
JNIEXPORT jint JNICALL
Java_sun_awt_X11_XWindow_getKeySymForAWTKeyCode(JNIEnv* env, jclass clazz, jint keycode) {
return awt_getX11KeySym(keycode);
}

8
jdk/src/solaris/native/sun/xawt/XlibWrapper.c
View File

@ -359,7 +359,7 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XDestroyWindow
XDestroyWindow( (Display *)jlong_to_ptr(display),(Window) window);
}
JNIEXPORT int JNICALL Java_sun_awt_X11_XlibWrapper_XGrabPointer
JNIEXPORT jint JNICALL Java_sun_awt_X11_XlibWrapper_XGrabPointer
(JNIEnv *env, jclass clazz, jlong display, jlong window,
jint owner_events, jint event_mask, jint pointer_mode,
jint keyboard_mode, jlong confine_to, jlong cursor, jlong time)
@ -377,7 +377,7 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XUngrabPointer
XUngrabPointer( (Display *)jlong_to_ptr(display), (Time) time);
}
JNIEXPORT int JNICALL Java_sun_awt_X11_XlibWrapper_XGrabKeyboard
JNIEXPORT jint JNICALL Java_sun_awt_X11_XlibWrapper_XGrabKeyboard
(JNIEnv *env, jclass clazz, jlong display, jlong window,
jint owner_events, jint pointer_mode,
jint keyboard_mode, jlong time)
@ -621,7 +621,7 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XSync
}
JNIEXPORT int JNICALL Java_sun_awt_X11_XlibWrapper_XTranslateCoordinates
JNIEXPORT jint JNICALL Java_sun_awt_X11_XlibWrapper_XTranslateCoordinates
(JNIEnv *env, jclass clazz, jlong display, jlong src_w, jlong dest_w,
jlong src_x, jlong src_y, jlong dest_x_return, jlong dest_y_return,
jlong child_return)
@ -634,7 +634,7 @@ JNIEXPORT int JNICALL Java_sun_awt_X11_XlibWrapper_XTranslateCoordinates
(Window *) jlong_to_ptr(child_return));
}
JNIEXPORT int JNICALL Java_sun_awt_X11_XlibWrapper_XEventsQueued
JNIEXPORT jint JNICALL Java_sun_awt_X11_XlibWrapper_XEventsQueued
(JNIEnv *env, jclass clazz, jlong display, jint mode) {
AWT_CHECK_HAVE_LOCK();