diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2013-06-06 21:40:43 +0100 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2013-06-06 21:40:43 +0100 |
| commit | 43623e3a6303cc6201f0ebfd151841a2f69b5c11 (patch) | |
| tree | df5d3565ea12f29dadf8ccaca082df58d015aa6e | |
| parent | 54302dc78fe021d976ef5c1c0d90accff309d123 (diff) | |
| download | classpath-43623e3a6303cc6201f0ebfd151841a2f69b5c11.tar.gz | |
Allow builds with -Werror with GLib >= 2.32.
2013-06-06 Andrew John Hughes <gnu_andrew@member.fsf.org>
* native/jni/gstreamer-peer/gst_classpath_src.c:
Define GLIB_DISABLE_DEPRECATION_WARNINGS so
the use of GStaticRecMutex in GStreamer still works.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c:
(init_glib_threads(JNIEnv,jint,jobject)): Only
call g_thread_init on GLib < 2.32.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | native/jni/gstreamer-peer/gst_classpath_src.c | 1 | ||||
| -rw-r--r-- | native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c | 2 |
3 files changed, 12 insertions, 0 deletions
@@ -1,3 +1,12 @@ +2013-06-06 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * native/jni/gstreamer-peer/gst_classpath_src.c: + Define GLIB_DISABLE_DEPRECATION_WARNINGS so + the use of GStaticRecMutex in GStreamer still works. + * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c: + (init_glib_threads(JNIEnv,jint,jobject)): Only + call g_thread_init on GLib < 2.32. + 2013-06-04 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/java/security/PolicyFile.java: diff --git a/native/jni/gstreamer-peer/gst_classpath_src.c b/native/jni/gstreamer-peer/gst_classpath_src.c index 224622a1c..cec2abbc4 100644 --- a/native/jni/gstreamer-peer/gst_classpath_src.c +++ b/native/jni/gstreamer-peer/gst_classpath_src.c @@ -45,6 +45,7 @@ exception statement from your version. */ * TODO: Maybe this should be moved in config.h instead? */ #define CLASSPATH_GST_PLUGIN_VERSION PACKAGE_VERSION +#define GLIB_DISABLE_DEPRECATION_WARNINGS #include <stdio.h> #include <string.h> diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c index ad996641f..758399c64 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c @@ -273,7 +273,9 @@ init_glib_threads(JNIEnv *env, jint portableNativeSync, jobject lock) global_lock = (*env)->NewGlobalRef(env, lock); gdk_threads_set_lock_functions(&jni_lock_cb, &jni_unlock_cb); } +#if GLIB_MINOR_VERSION < 32 g_thread_init(NULL); +#endif } else { |