gst/: Convergence is near. Seriously.

Original commit message from CVS:
* gst/glib-compat.h:
* gst/gstregistryxml.c:
Convergence is near.  Seriously.

diff --git a/ChangeLog b/ChangeLog
index ef8c14c..2e70713 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-09-14  David Schleef  <ds@schleef.org>
 
+       * gst/glib-compat.h:
+       * gst/gstregistryxml.c:
+         Convergence is near.  Seriously.
+
+2005-09-14  David Schleef  <ds@schleef.org>
+
        * gst/glib-compat.c: (g_mkdir_with_parents), (g_mkdir), (g_stat):
        * gst/glib-compat.h:
          Attempt #4 to appease the buildbots.

diff --git a/gst/glib-compat.h b/gst/glib-compat.h
index d3b688a..3b8e253 100644 (file)
--- a/gst/glib-compat.h
+++ b/gst/glib-compat.h
@@ -6,6 +6,9 @@
  */
 
 #include <glib.h>
+#if GLIB_CHECK_VERSION (2, 6, 0)
+#include <glib/gstdio.h>
+#endif
 
 G_BEGIN_DECLS
 

diff --git a/gst/gstregistryxml.c b/gst/gstregistryxml.c
index de19510..fe5405c 100644 (file)
--- a/gst/gstregistryxml.c
+++ b/gst/gstregistryxml.c
@@ -43,7 +43,6 @@
 #include <gst/gstinfo.h>
 #include <gst/gstenumtypes.h>
 #include <gst/gstregistry.h>
-#include <glib/gstdio.h>
 
 #include <libxml/xmlreader.h>