From e415bd9957a8b1b8c9efbf75c6cd819411651f0a Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Mon, 10 Oct 2005 16:04:28 +0000 Subject: [PATCH] gst/gst.c (G_OPTION_FLAG_NO_ARG): Apparently GLib 2.8 requires this flag, but it's not even in GLib 2.6. Odd. Hack ar... Original commit message from CVS: 2005-10-10 Andy Wingo * gst/gst.c (G_OPTION_FLAG_NO_ARG): Apparently GLib 2.8 requires this flag, but it's not even in GLib 2.6. Odd. Hack around the issue. --- ChangeLog | 6 ++++++ gst/gst.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 20ca93f..dadfa58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,12 @@ 2005-10-10 Andy Wingo + * gst/gst.c (G_OPTION_FLAG_NO_ARG): Apparently GLib 2.8 requires + this flag, but it's not even in GLib 2.6. Odd. Hack around the + issue. + +2005-10-10 Andy Wingo + Merged in popt removal + GOption addition patch from Ronald, bug #169772. diff --git a/gst/gst.c b/gst/gst.c index d8960b8..f6f79c1 100644 --- a/gst/gst.c +++ b/gst/gst.c @@ -237,6 +237,10 @@ parse_debug_list (const gchar * list) g_strfreev (split); } +#ifndef GST_HAVE_GLIB_2_8 +#define G_OPTION_FLAG_NO_ARG 0 +#endif + /** * gst_init_get_option_group: * -- 2.7.4