gst/gst.h: Include glib-compat.h.

Original commit message from CVS:
2005-11-21  Andy Wingo  <wingo@pobox.com>

* gst/gst.h: Include glib-compat.h.

* gst/glib-compat.h: Add G_GNUC_NULL_TERMINATED.

* gst/glib-compat.c: Include the public and the private header.

* gst/glib-compat-private.h: Copied here from glib-compat.h.

* gst/gstvalue.c:
* gst/gstpad.c:
* gst/gstregistryxml.c: s/glib-compat/glib-compat-private/.

diff --git a/ChangeLog b/ChangeLog
index 6de0eb1..93afa0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2005-11-21  Andy Wingo  <wingo@pobox.com>
 
+       * gst/gst.h: Include glib-compat.h.
+
+       * gst/glib-compat.h: Add G_GNUC_NULL_TERMINATED.
+
+       * gst/glib-compat.c: Include the public and the private header.
+
+       * gst/glib-compat-private.h: Copied here from glib-compat.h.
+
+       * gst/gstvalue.c: 
+       * gst/gstpad.c: 
+       * gst/gstregistryxml.c: s/glib-compat/glib-compat-private/.
+
        * check/gst/gstevent.c (create_custom_events): Check that
        FLUSH_STOP is serialized.
 

diff --git a/gst/glib-compat-private.h b/gst/glib-compat-private.h
new file mode 100644 (file)
index 0000000..c9399dc
--- /dev/null
+++ b/gst/glib-compat-private.h
@@ -0,0 +1,27 @@
+/*
+ * glib-compat.c
+ * Functions copied from glib 2.8
+ *
+ * Copyright 2005 David Schleef <ds@schleef.org>
+ */
+
+#include "gst_private.h" /* for g_warning */
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+/* copies */
+#if !GLIB_CHECK_VERSION (2, 8, 0)
+int g_mkdir_with_parents (const gchar *pathname, int          mode);
+#endif
+
+/* adaptations */
+#include <glib-object.h>
+GFlagsValue*
+gst_flags_get_first_value (GFlagsClass *flags_class,
+                           guint        value);
+
+GObject*
+g_value_dup_gst_object (const GValue *value);
+G_END_DECLS
+

diff --git a/gst/glib-compat.c b/gst/glib-compat.c
index 4dc9515..b06955c 100644 (file)
--- a/gst/glib-compat.c
+++ b/gst/glib-compat.c
@@ -34,6 +34,7 @@
 #include <errno.h>
 
 #include "glib-compat.h"
+#include "glib-compat-private.h"
 
 #include <sys/stat.h>
 #ifdef HAVE_UNISTD_H

diff --git a/gst/glib-compat.h b/gst/glib-compat.h
index 74d669f..77b221d 100644 (file)
--- a/gst/glib-compat.h
+++ b/gst/glib-compat.h
@@ -1,27 +1,46 @@
-/*
- * glib-compat.c
- * Functions copied from glib 2.6 and 2.8
+/* GStreamer
+ * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * glib-compat.h: Public GLib compatibility shims
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
  *
- * Copyright 2005 David Schleef <ds@schleef.org>
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
+/*
+ * Modified by the GLib Team and others 1997-2000. See the AUTHORS file from
+ * glib-2.8.0 for a list of people on the GLib Team. See the ChangeLog files
+ * from glib-2.8.0 for a list of changes. These files are distributed with GLib
+ * at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#include "gst_private.h" /* for g_warning */
-#include <glib.h>
+#ifndef __GST_GLIB_COMPAT_H__
+#define __GST_GLIB_COMPAT_H__
 
 G_BEGIN_DECLS
 
-/* copies */
+/* added in GLib 2.8 */
 #if !GLIB_CHECK_VERSION (2, 8, 0)
-int g_mkdir_with_parents (const gchar *pathname, int          mode);
+#if     __GNUC__ >= 4
+#define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
+#else
+#define G_GNUC_NULL_TERMINATED
+#endif
 #endif
 
-/* adaptations */
-#include <glib-object.h>
-GFlagsValue*
-gst_flags_get_first_value (GFlagsClass *flags_class,
-                           guint        value);
-
-GObject*
-g_value_dup_gst_object (const GValue *value);
 G_END_DECLS
 
+#endif /* __GST_GLIB_COMPAT_H__ */

diff --git a/gst/gst.h b/gst/gst.h
index c65943b..c5aab1d 100644 (file)
--- a/gst/gst.h
+++ b/gst/gst.h
@@ -26,6 +26,8 @@
 
 #include <glib.h>
 
+#include <gst/glib-compat.h>
+
 #include <gst/gstenumtypes.h>
 #include <gst/gstversion.h>
 

diff --git a/gst/gstpad.c b/gst/gstpad.c
index d3be384..09859d1 100644 (file)
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -71,7 +71,7 @@
 #include "gstinfo.h"
 #include "gsterror.h"
 #include "gstvalue.h"
-#include "glib-compat.h"
+#include "glib-compat-private.h"
 
 GST_DEBUG_CATEGORY_STATIC (debug_dataflow);
 #define GST_CAT_DEFAULT GST_CAT_PADS

diff --git a/gst/gstregistryxml.c b/gst/gstregistryxml.c
index 745e3f5..31f50fd 100644 (file)
--- a/gst/gstregistryxml.c
+++ b/gst/gstregistryxml.c
@@ -46,7 +46,7 @@
 
 #include <libxml/xmlreader.h>
 
-#include "glib-compat.h"
+#include "glib-compat-private.h"
 #include <glib/gstdio.h>
 
 #define BLOCK_SIZE 1024*10

diff --git a/gst/gstvalue.c b/gst/gstvalue.c
index 2687f7c..b194ede 100644 (file)
--- a/gst/gstvalue.c
+++ b/gst/gstvalue.c
@@ -32,7 +32,7 @@
 #include <ctype.h>
 
 #include "gst_private.h"
-#include "glib-compat.h"
+#include "glib-compat-private.h"
 #include <gst/gst.h>
 #include <gobject/gvaluecollector.h>