Index: gstreamer/gst/gstobject.h
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstobject.h,v
retrieving revision 1.78
diff -p -u -r1.78 gstobject.h
--- gstreamer/gst/gstobject.h	15 May 2006 08:16:09 -0000	1.78
+++ gstreamer/gst/gstobject.h	12 Oct 2006 11:04:53 -0000
@@ -42,7 +42,9 @@ G_BEGIN_DECLS
 /* make sure we don't change the object size but still make it compile
  * without libxml */
 #ifdef GST_DISABLE_LOADSAVE_REGISTRY
-#define xmlNodePtr	gpointer
+#define GstXmlNodePtr	gpointer
+#else
+#define GstXmlNodePtr	xmlNodePtr
 #endif
 
 /**
@@ -255,13 +257,13 @@ struct _GstObjectClass {
   /* signals */
   void		(*parent_set)		(GstObject *object, GstObject *parent);
   void		(*parent_unset)		(GstObject *object, GstObject *parent);
-  void		(*object_saved)		(GstObject *object, xmlNodePtr parent);
+  void		(*object_saved)		(GstObject *object, GstXmlNodePtr parent);
   void 		(*deep_notify)   	(GstObject *object, GstObject *orig, GParamSpec *pspec);
 
   /*< public >*/
   /* virtual methods for subclasses */
-  xmlNodePtr	(*save_thyself)		(GstObject *object, xmlNodePtr parent);
-  void		(*restore_thyself)	(GstObject *object, xmlNodePtr self);
+  GstXmlNodePtr	(*save_thyself)		(GstObject *object, GstXmlNodePtr parent);
+  void		(*restore_thyself)	(GstObject *object, GstXmlNodePtr self);
 
   /*< private >*/
   gpointer _gst_reserved[GST_PADDING];
@@ -301,8 +303,8 @@ gboolean	gst_object_check_uniqueness	(GL
 
 /* load/save */
 #ifndef GST_DISABLE_LOADSAVE_REGISTRY
-xmlNodePtr	gst_object_save_thyself		(GstObject *object, xmlNodePtr parent);
-void		gst_object_restore_thyself	(GstObject *object, xmlNodePtr self);
+GstXmlNodePtr	gst_object_save_thyself		(GstObject *object, GstXmlNodePtr parent);
+void		gst_object_restore_thyself	(GstObject *object, GstXmlNodePtr self);
 #else
 #if defined _GNUC_ && _GNUC_ >= 3
 #pragma GCC poison gst_object_save_thyself
@@ -319,7 +321,7 @@ guint		gst_class_signal_connect	(GstObje
 #ifndef GST_DISABLE_LOADSAVE_REGISTRY
 void		gst_class_signal_emit_by_name	(GstObject	*object,
 		                                 const gchar	*name,
-						 xmlNodePtr 	 self);
+						 GstXmlNodePtr	 self);
 #else
 #if defined _GNUC_ && _GNUC_ >= 3
 #pragma GCC poison gst_class_signal_emit_by_name
