From f16b4cd1be1513696a47d5e4a812e1123cca35d9 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Tue, 28 Aug 2012 19:45:28 +0300 Subject: Remove cast in dynamic method breaking compilation. This should have been part of bug 369624. --- bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c | 4 ++-- .../Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java | 1 - 2 files changed, 2 insertions(+), 3 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 12cff6d853..16ad4e8134 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 @@ -5767,12 +5767,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pango_1context_1set_1colormap) { OS_NATIVE_ENTER(env, that, _1gdk_1pango_1context_1set_1colormap_FUNC); /* - gdk_pango_context_set_colormap((PangoContext *)arg0, (GdkColormap *)arg1); + gdk_pango_context_set_colormap((PangoContext *)arg0, arg1); */ { OS_LOAD_FUNCTION(fp, gdk_pango_context_set_colormap) if (fp) { - ((void (CALLING_CONVENTION*)(PangoContext *, GdkColormap *))fp)((PangoContext *)arg0, (GdkColormap *)arg1); + ((void (CALLING_CONVENTION*)(PangoContext *, jintLong))fp)((PangoContext *)arg0, arg1); } } OS_NATIVE_EXIT(env, that, _1gdk_1pango_1context_1set_1colormap_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 312603a2b1..c0ae254c02 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 @@ -4349,7 +4349,6 @@ public static final int /*long*/ gdk_pango_context_get() { /** * @method flags=dynamic * @param context cast=(PangoContext *) - * @param colormap cast=(GdkColormap *) */ public static final native void _gdk_pango_context_set_colormap(int /*long*/ context, int /*long*/ colormap); public static final void gdk_pango_context_set_colormap(int /*long*/ context, int /*long*/ colormap) { -- cgit