diff options
| author | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-08-01 11:48:45 -0400 |
|---|---|---|
| committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-08-01 11:48:45 -0400 |
| commit | 2d0d1fe9d220400e0b4957016ec81f97281b8e3b (patch) | |
| tree | 2210268db97644bcb952c5eb50ab182a29b08bb6 | |
| parent | e9e22c53a60c9c658a4f6a4c696542fdb7101ed7 (diff) | |
| download | eclipse.platform.swt-2d0d1fe9d220400e0b4957016ec81f97281b8e3b.tar.gz eclipse.platform.swt-2d0d1fe9d220400e0b4957016ec81f97281b8e3b.tar.xz eclipse.platform.swt-2d0d1fe9d220400e0b4957016ec81f97281b8e3b.zip | |
fix 64 bit problems
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c | 16 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c index f2fee3d8f5..8cef1d312e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c @@ -6749,18 +6749,18 @@ fail: #endif #ifndef NO__1gdk_1window_1get_1height -JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1height) +JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1height) (JNIEnv *env, jclass that, jintLong arg0) { - jintLong rc = 0; + jint rc = 0; OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1height_FUNC); /* - rc = (jintLong)gdk_window_get_height((GdkWindow *)arg0); + rc = (jint)gdk_window_get_height((GdkWindow *)arg0); */ { OS_LOAD_FUNCTION(fp, gdk_window_get_height) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *))fp)((GdkWindow *)arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(GdkWindow *))fp)((GdkWindow *)arg0); } } OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1height_FUNC); @@ -6873,18 +6873,18 @@ fail: #endif #ifndef NO__1gdk_1window_1get_1width -JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1width) +JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1width) (JNIEnv *env, jclass that, jintLong arg0) { - jintLong rc = 0; + jint rc = 0; OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1width_FUNC); /* - rc = (jintLong)gdk_window_get_width((GdkWindow *)arg0); + rc = (jint)gdk_window_get_width((GdkWindow *)arg0); */ { OS_LOAD_FUNCTION(fp, gdk_window_get_width) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *))fp)((GdkWindow *)arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(GdkWindow *))fp)((GdkWindow *)arg0); } } OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1width_FUNC); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java index 03395f8eba..972e477b83 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java @@ -3483,8 +3483,8 @@ public static final void gdk_cairo_set_source_color(int /*long*/ cairo, GdkColor * @param window cast=(GdkWindow *) * @method flags=dynamic */ -public static final native int /*long*/ _gdk_window_get_width(int /*long*/ window); -public static final int /*long*/ gdk_window_get_width(int /*long*/ window) { +public static final native int _gdk_window_get_width(int /*long*/ window); +public static final int gdk_window_get_width(int /*long*/ window) { lock.lock(); try { return _gdk_window_get_width(window); @@ -3496,8 +3496,8 @@ public static final int /*long*/ gdk_window_get_width(int /*long*/ window) { * @param window cast=(GdkWindow *) * @method flags=dynamic */ -public static final native int /*long*/ _gdk_window_get_height(int /*long*/ window); -public static final int /*long*/ gdk_window_get_height(int /*long*/ window) { +public static final native int _gdk_window_get_height(int /*long*/ window); +public static final int gdk_window_get_height(int /*long*/ window) { lock.lock(); try { return _gdk_window_get_height(window); |