diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-06-26 01:01:49 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-06-26 10:35:38 +0100 |
| commit | 71f3a6f0f7a347d2d2a92d33c189c6cba12c4577 (patch) | |
| tree | 0f78802eb57dda97ec2e0ddd7b6aaf66dfae3588 | |
| parent | a70a6d10ff4a2699a68bff1c0b86bf7415f829b7 (diff) | |
Don't include <libxml/parser.h> from public headers if GST_DISABLE_DEPRECATED is defined
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.
| -rw-r--r-- | gst/gstbin.c | 1 | ||||
| -rw-r--r-- | gst/gstcaps.c | 1 | ||||
| -rw-r--r-- | gst/gstconfig.h.in | 2 | ||||
| -rw-r--r-- | gst/gstelement.c | 1 | ||||
| -rw-r--r-- | gst/gstghostpad.c | 3 | ||||
| -rw-r--r-- | gst/gstobject.c | 1 | ||||
| -rw-r--r-- | gst/gstpad.c | 3 | ||||
| -rw-r--r-- | gst/gstxml.c | 1 | ||||
| -rw-r--r-- | plugins/indexers/gstfileindex.c | 4 |
9 files changed, 17 insertions, 0 deletions
diff --git a/gst/gstbin.c b/gst/gstbin.c index 79876457f..2019b9f94 100644 --- 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 243c751ce..26a7dbd22 100644 --- 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 a849ecb87..e23ea03da 100644 --- 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 d9030c079..3d7daff77 100644 --- 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 7852166a8..3da71c56c 100644 --- 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 dc6eda92f..11dd6b530 100644 --- 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 6808bfc56..0e0f7de8c 100644 --- 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 b972e39bf..9fa1e31b7 100644 --- 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 4bcd3592a..4744abcdc 100644 --- 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 \ |