diff options
| author | Alexander Kurtakov <akurtako@redhat.com> | 2013-04-27 16:26:15 +0300 |
|---|---|---|
| committer | Alexander Kurtakov <akurtako@redhat.com> | 2013-04-27 16:27:09 +0300 |
| commit | 5d18a6b112a901db9cc96a414c22e67f0e7269d9 (patch) | |
| tree | 4ef2a0449f128ccb61ba4d06648b5ce479bf71e9 | |
| parent | 7ab1faa6c9a636136c7b44272bdb8f3c459e03e8 (diff) | |
| download | eclipse.platform.swt-5d18a6b112a901db9cc96a414c22e67f0e7269d9.tar.gz eclipse.platform.swt-5d18a6b112a901db9cc96a414c22e67f0e7269d9.tar.xz eclipse.platform.swt-5d18a6b112a901db9cc96a414c22e67f0e7269d9.zip | |
Remove g_thread_init parameter cast.
The method is dynamic so the cast is not needed. This fixes compilation
on GLib 2.36 where GThreadFunctions type is not visible with
G_DISABLE_DEPRECATED.
| -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 f9eb5cb146..9a7d196c02 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 @@ -4146,12 +4146,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1thread_1init) { OS_NATIVE_ENTER(env, that, _1g_1thread_1init_FUNC); /* - g_thread_init((GThreadFunctions *)arg0); + g_thread_init(arg0); */ { OS_LOAD_FUNCTION(fp, g_thread_init) if (fp) { - ((void (CALLING_CONVENTION*)(GThreadFunctions *))fp)((GThreadFunctions *)arg0); + ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); } } OS_NATIVE_EXIT(env, that, _1g_1thread_1init_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 901d98e0ce..1e04c972d7 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 @@ -3309,7 +3309,6 @@ public static final long /*int*/ g_type_register_static (long /*int*/ parent_typ } /** * @method flags=dynamic - * @param vtable cast=(GThreadFunctions *) */ public static final native void _g_thread_init(long /*int*/ vtable); public static final void g_thread_init(long /*int*/ vtable) { |