Don't include <libxml/parser.h> from public headers if GST_DISABLE_DEPRECATED is...

Since everything GstXML related has been deprecated, we can now skip the
libxml includes from the public headers when GST_DISABLE_DEPRECATED is
defined.

See #463435.

diff --git a/gst/gstbin.c b/gst/gstbin.c
index 79876457faf823191cb3a024743edf6f6df56e79..2019b9f94806462bc9ed887460c8c2585222a9f8 100644 (file)
--- a/gst/gstbin.c
+++ b/gst/gstbin.c
@@ -175,6 +175,7 @@
 #if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_REMOVE_DEPRECATED)
 #undef GstXmlNodePtr
 #define GstXmlNodePtr xmlNodePtr
+#include <libxml/parser.h>
 GstXmlNodePtr gst_object_save_thyself (GstObject * object,
     GstXmlNodePtr parent);
 void gst_object_restore_thyself (GstObject * object, GstXmlNodePtr parent);

diff --git a/gst/gstcaps.c b/gst/gstcaps.c
index 243c751cea4cc322bbe6951f3e203b4850714a6a..26a7dbd22e679e0d9b683a543fac221770c99618 100644 (file)
--- a/gst/gstcaps.c
+++ b/gst/gstcaps.c
@@ -75,6 +75,7 @@
 
 #ifdef GST_DISABLE_DEPRECATED
 #if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_REMOVE_DEPRECATED)
+#include <libxml/parser.h>
 xmlNodePtr gst_caps_save_thyself (const GstCaps * caps, xmlNodePtr parent);
 GstCaps *gst_caps_load_thyself (xmlNodePtr parent);
 #endif

diff --git a/gst/gstconfig.h.in b/gst/gstconfig.h.in
index a849ecb875d661b6c728942e1f9375692b64f602..e23ea03da4dea8a4a722f19ef1f208b412558e6e 100644 (file)
--- a/gst/gstconfig.h.in
+++ b/gst/gstconfig.h.in
@@ -194,7 +194,9 @@
 /* FIXME: move include to where we need it */
 /*#if (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) )*/
 #ifndef GST_DISABLE_XML
+#ifndef GST_DISABLE_DEPRECATED
 # include <libxml/parser.h>
+#endif
 #else
   /* FIXME: 0.11 (replace by GST_DISABLE_XML) */
 # define GST_DISABLE_LOADSAVE_REGISTRY

diff --git a/gst/gstelement.c b/gst/gstelement.c
index d9030c0795201e65b1dee525a768d0bc710f0496..3d7daff77949bf87959079485386dd235d49ed4d 100644 (file)
--- a/gst/gstelement.c
+++ b/gst/gstelement.c
@@ -111,6 +111,7 @@ enum
 
 #ifdef GST_DISABLE_DEPRECATED
 #if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_REMOVE_DEPRECATED)
+#include <libxml/parser.h>
 xmlNodePtr gst_object_save_thyself (const GstObject * object,
     xmlNodePtr parent);
 GstObject *gst_object_load_thyself (xmlNodePtr parent);

diff --git a/gst/gstghostpad.c b/gst/gstghostpad.c
index 7852166a80b4937f47117716fadd705f57b49699..3da71c56c85fd6aa5473e06dbebb9bc470771004 100644 (file)
--- a/gst/gstghostpad.c
+++ b/gst/gstghostpad.c
@@ -78,6 +78,9 @@ static void gst_proxy_pad_dispose (GObject * object);
 static void gst_proxy_pad_finalize (GObject * object);
 
 #if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_REMOVE_DEPRECATED)
+#ifdef GST_DISABLE_DEPRECATED
+#include <libxml/parser.h>
+#endif
 static xmlNodePtr gst_proxy_pad_save_thyself (GstObject * object,
     xmlNodePtr parent);
 #endif

diff --git a/gst/gstobject.c b/gst/gstobject.c
index dc6eda92f18ed66d4806961e6c3092a3999f90f7..11dd6b530f6592deac176037ffbad2bdd5cacc97 100644 (file)
--- a/gst/gstobject.c
+++ b/gst/gstobject.c
@@ -154,6 +154,7 @@ static gboolean gst_object_set_name_default (GstObject * object);
 #if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_REMOVE_DEPRECATED)
 #undef GstXmlNodePtr
 #define GstXmlNodePtr xmlNodePtr
+#include <libxml/parser.h>
 GstXmlNodePtr gst_object_save_thyself (GstObject * object,
     GstXmlNodePtr parent);
 void gst_object_restore_thyself (GstObject * object, GstXmlNodePtr parent);

diff --git a/gst/gstpad.c b/gst/gstpad.c
index 6808bfc56fdc7cfb43bbc08ee0a409ec557e58e3..0e0f7de8c872d03084cf4a8dcce5fb3e29239089 100644 (file)
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -119,6 +119,9 @@ static gboolean gst_pad_activate_default (GstPad * pad);
 static gboolean gst_pad_acceptcaps_default (GstPad * pad, GstCaps * caps);
 
 #if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_REMOVE_DEPRECATED)
+#ifdef GST_DISABLE_DEPRECATED
+#include <libxml/parser.h>
+#endif
 static xmlNodePtr gst_pad_save_thyself (GstObject * object, xmlNodePtr parent);
 void gst_pad_load_and_link (xmlNodePtr self, GstObject * parent);
 #endif

diff --git a/gst/gstxml.c b/gst/gstxml.c
index b972e39bfb6b41b3c568eff874f3e39ab1cbf2d4..9fa1e31b71be51c7fbedbde30cb9514dd6f57f1d 100644 (file)
--- a/gst/gstxml.c
+++ b/gst/gstxml.c
@@ -47,6 +47,7 @@
 
 #ifdef GST_DISABLE_DEPRECATED
 #if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_REMOVE_DEPRECATED)
+#include <libxml/parser.h>
 xmlNodePtr gst_object_save_thyself (const GstObject * object,
     xmlNodePtr parent);
 GstObject *gst_object_load_thyself (xmlNodePtr parent);

diff --git a/plugins/indexers/gstfileindex.c b/plugins/indexers/gstfileindex.c
index 4bcd3592a3e2ea033c6b3cf2063c8352060429f7..4744abcdcb10a0d262566e92ae88bb709b82bb1b 100644 (file)
--- a/plugins/indexers/gstfileindex.c
+++ b/plugins/indexers/gstfileindex.c
@@ -27,6 +27,10 @@
 #include <fcntl.h>
 #include <string.h>
 
+#ifdef GST_DISABLE_DEPRECATED
+#include <libxml/parser.h>
+#endif
+
 #include "gstindexers.h"
 
 #define GST_TYPE_FILE_INDEX             \