Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6677332: incorrect signatures for JNI methods in XWindow.c and XlibWrapper.c
authorson
Wed, 02 Apr 2008 17:45:50 +0400
changeset 433 a7f6bc61993d
parent 432 ff3aa6ee3572
child 434 acc4487b3f1b
6677332: incorrect signatures for JNI methods in XWindow.c and XlibWrapper.c Summary: int replaced with jint in XWindow.c and WlibWrapper.c, and BOOL replaced with Bool in MouseInfo.c. Reviewed-by: anthony Contributed-by: roman.kennke@aicas.com
jdk/src/solaris/native/sun/awt/MouseInfo.c file | annotate | diff | comparison | revisions
jdk/src/solaris/native/sun/xawt/XWindow.c file | annotate | diff | comparison | revisions
jdk/src/solaris/native/sun/xawt/XlibWrapper.c file | annotate | diff | comparison | revisions 
--- a/jdk/src/solaris/native/sun/awt/MouseInfo.c	Tue Apr 01 17:38:46 2008 +0400
+++ b/jdk/src/solaris/native/sun/awt/MouseInfo.c	Wed Apr 02 17:45:50 2008 +0400
@@ -54,7 +54,7 @@
      int i;
      int32_t xr, yr, xw, yw;
      uint32_t keys;
-     BOOL pointerFound;
+     Bool pointerFound;
 
      AWT_LOCK();
      if (pointClass == NULL) {
@@ -102,7 +102,7 @@
     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;
 
--- a/jdk/src/solaris/native/sun/xawt/XWindow.c	Tue Apr 01 17:38:46 2008 +0400
+++ b/jdk/src/solaris/native/sun/xawt/XWindow.c	Wed Apr 02 17:45:50 2008 +0400
@@ -1234,7 +1234,7 @@
    }
 }
 
-JNIEXPORT int JNICALL
+JNIEXPORT jint JNICALL
 Java_sun_awt_X11_XWindow_getKeySymForAWTKeyCode(JNIEnv* env, jclass clazz, jint keycode) {
     return awt_getX11KeySym(keycode);
 }
--- a/jdk/src/solaris/native/sun/xawt/XlibWrapper.c	Tue Apr 01 17:38:46 2008 +0400
+++ b/jdk/src/solaris/native/sun/xawt/XlibWrapper.c	Wed Apr 02 17:45:50 2008 +0400
@@ -359,7 +359,7 @@
     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 @@
     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 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 @@
                   (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();
jdk-sandbox