diff options
| author | Alexander Kurtakov | 2013-07-30 06:11:27 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2013-07-30 06:11:27 +0000 |
| commit | e7b1305b520b12092850cfdbc2902440b88b4e46 (patch) | |
| tree | db641ace12c56ea4c22f61f5d32c88dc0f69d6b9 | |
| parent | c5d929b161f90dfb73413ce6147670bc8d05fb20 (diff) | |
| download | eclipse.platform.swt-e7b1305b520b12092850cfdbc2902440b88b4e46.tar.gz eclipse.platform.swt-e7b1305b520b12092850cfdbc2902440b88b4e46.tar.xz eclipse.platform.swt-e7b1305b520b12092850cfdbc2902440b88b4e46.zip | |
Remove GIcon cast.
The method id dynamic so the cast is not really needed and causes
failures when building on RHEL 5.
Change-Id: Iaf0fe5f94943b54c924afc0ca94ec96a08dff836
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c | 4 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/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 5ff279ea64..00fdab5a7f 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 @@ -11327,12 +11327,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1gicon) { OS_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1gicon_FUNC); /* - gtk_image_set_from_gicon((GtkImage *)arg0, (GIcon *)arg1, (GtkIconSize)arg2); + gtk_image_set_from_gicon((GtkImage *)arg0, arg1, (GtkIconSize)arg2); */ { OS_LOAD_FUNCTION(fp, gtk_image_set_from_gicon) if (fp) { - ((void (CALLING_CONVENTION*)(GtkImage *, GIcon *, GtkIconSize))fp)((GtkImage *)arg0, (GIcon *)arg1, (GtkIconSize)arg2); + ((void (CALLING_CONVENTION*)(GtkImage *, jintLong, GtkIconSize))fp)((GtkImage *)arg0, arg1, (GtkIconSize)arg2); } } OS_NATIVE_EXIT(env, that, _1gtk_1image_1set_1from_1gicon_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 5f81743b6b..898301c6d2 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 @@ -8268,7 +8268,6 @@ public static final void gtk_image_set_from_pixbuf(long /*int*/ image, long /*in /** * @method flags=dynamic * @param image cast=(GtkImage *) - * @param gicon cast=(GIcon *) * @param size cast=(GtkIconSize) */ public static final native void _gtk_image_set_from_gicon(long /*int*/ image, long /*int*/ gicon, int size); |