From 63ba006e0e2da8c83bd2de26ebabea869508dba0 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Tue, 9 Oct 2012 12:21:21 +0300 Subject: Fix bug#391408 - Remove GdkVisual_sizeof. Unused function that breaks compilation on GTK 3.x. --- bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c | 12 ------------ .../org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c | 1 - .../org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h | 1 - .../Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java | 1 - 4 files changed, 15 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 9cd1bfaf76..b4a5049595 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 @@ -681,18 +681,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(GdkRectangle_1sizeof) } #endif -#ifndef NO_GdkVisual_1sizeof -JNIEXPORT jint JNICALL OS_NATIVE(GdkVisual_1sizeof) - (JNIEnv *env, jclass that) -{ - jint rc = 0; - OS_NATIVE_ENTER(env, that, GdkVisual_1sizeof_FUNC); - rc = (jint)GdkVisual_sizeof(); - OS_NATIVE_EXIT(env, that, GdkVisual_1sizeof_FUNC); - return rc; -} -#endif - #ifndef NO_GdkWindowAttr_1sizeof JNIEXPORT jint JNICALL OS_NATIVE(GdkWindowAttr_1sizeof) (JNIEnv *env, jclass that) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c index e2f989556d..77ca17ab03 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c @@ -82,7 +82,6 @@ char * OS_nativeFunctionNames[] = { "GdkGCValues_1sizeof", "GdkGeometry_1sizeof", "GdkRectangle_1sizeof", - "GdkVisual_1sizeof", "GdkWindowAttr_1sizeof", "GtkAdjustment_1sizeof", "GtkAllocation_1sizeof", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h index e3c1bc81cd..ad70de1ac7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h @@ -92,7 +92,6 @@ typedef enum { GdkGCValues_1sizeof_FUNC, GdkGeometry_1sizeof_FUNC, GdkRectangle_1sizeof_FUNC, - GdkVisual_1sizeof_FUNC, GdkWindowAttr_1sizeof_FUNC, GtkAdjustment_1sizeof_FUNC, GtkAllocation_1sizeof_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 475739a0db..af6fe48629 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 @@ -638,7 +638,6 @@ public static final native int GdkEventWindowState_sizeof(); public static final native int GdkGCValues_sizeof(); public static final native int GdkGeometry_sizeof(); public static final native int GdkRectangle_sizeof(); -public static final native int GdkVisual_sizeof(); public static final native int GdkWindowAttr_sizeof(); public static final native int GtkAdjustment_sizeof(); public static final native int GtkAllocation_sizeof(); -- cgit