Bug 543234: Eclipse platform is not launching on ppc64LE architecture

Make gtk_widget_style_get() functions static, and if-def'd for GTK4.

Change-Id: I7cb0729a32aadd1acd57cd7a6a4c207fb436e470
Signed-off-by: Eric Williams <ericwill@redhat.com>

3 files changed, 6 insertions, 20 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 0da9bed84c..2bf0733585 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
@@ -13062,15 +13062,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1style_1get__J_3B_3IJ)(JNIEnv *e
 #endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-/*
 	gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_widget_style_get)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(GtkWidget *, const gchar *, jint *, const gchar *))fp)((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
-		}
-	}
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
@@ -13098,15 +13090,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1style_1get__J_3B_3JJ)(JNIEnv *e
 #endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-/*
 	gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_widget_style_get)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(GtkWidget *, const gchar *, jlong *, const gchar *))fp)((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
-		}
-	}
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
index c0c30a13a9..5ee41cf405 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
@@ -283,6 +283,10 @@
 #define NO__1gdk_1selection_1owner_1set
 #define NO__1gdk_1selection_1owner_1get
 #define NO__1gdk_1visual_1get_1depth
+#define NO__1gtk_1widget_1style_1get__I_3B_3II
+#define NO__1gtk_1widget_1style_1get__J_3B_3IJ
+#define NO__1gtk_1widget_1style_1get__I_3B_3JI
+#define NO__1gtk_1widget_1style_1get__J_3B_3JJ
 
 // Some GtkContainer functions don't exist on GTK4
 #define NO__1gtk_1container_1propagate_1draw
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
index 628c5fd7b0..6a09cc856d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
@@ -8971,13 +8971,12 @@ public class GTK extends OS {
 		}
 	}
 	/**
-	 * @method flags=dynamic
 	 * @param widget cast=(GtkWidget *)
 	 * @param property_name cast=(const gchar *)
 	 * @param terminator cast=(const gchar *),flags=sentinel
 	 */
 	public static final native void _gtk_widget_style_get(long /*int*/ widget, byte[] property_name, int[] value, long /*int*/ terminator);
-	/** [GTK3 only] */
+	/** [GTK3 only, if-def'd in os.h] */
 	public static final void gtk_widget_style_get(long /*int*/ widget, byte[] property_name, int[] value, long /*int*/ terminator) {
 		lock.lock();
 		try {
@@ -8987,13 +8986,12 @@ public class GTK extends OS {
 		}
 	}
 	/**
-	 * @method flags=dynamic
 	 * @param widget cast=(GtkWidget *)
 	 * @param property_name cast=(const gchar *)
 	 * @param terminator cast=(const gchar *),flags=sentinel
 	 */
 	public static final native void _gtk_widget_style_get(long /*int*/ widget, byte[] property_name, long[] value, long /*int*/ terminator);
-	/** [GTK3 only] */
+	/** [GTK3 only, if-def'd in os.h] */
 	public static final void gtk_widget_style_get(long /*int*/ widget, byte[] property_name, long[] value, long /*int*/ terminator) {
 		lock.lock();
 		try {