eventfd: set close-on-exec flag

[vlc] / src / misc / xml.c

diff --git a/src/misc/xml.c b/src/misc/xml.c
index c9f16fbc6d7408339a3c0e73a319d514cc6f2e6a..0d2625f8b3c6ece215b7ff0c3db0d4be1fbfbeef 100644 (file)
--- a/src/misc/xml.c
+++ b/src/misc/xml.c
@@ -25,17 +25,18 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
-
+#include <vlc_common.h>
 #include "vlc_xml.h"
+#include "../libvlc.h"
 
+#undef xml_Create
 /*****************************************************************************
  * xml_Create:
  *****************************************************************************
  * Create an instance of an XML parser.
  * Returns NULL on error.
  *****************************************************************************/
-xml_t *__xml_Create( vlc_object_t *p_this )
+xml_t *xml_Create( vlc_object_t *p_this )
 {
     xml_t *p_xml;
 
@@ -43,10 +44,9 @@ xml_t *__xml_Create( vlc_object_t *p_this )
                                "xml" );
     vlc_object_attach( p_xml, p_this );
 
-    p_xml->p_module = module_Need( p_xml, "xml", 0, 0 );
+    p_xml->p_module = module_need( p_xml, "xml", NULL, false );
     if( !p_xml->p_module )
     {
-        vlc_object_detach( p_xml );
         vlc_object_release( p_xml );
         msg_Err( p_this, "XML provider not found" );
         return NULL;
@@ -60,7 +60,6 @@ xml_t *__xml_Create( vlc_object_t *p_this )
  *****************************************************************************/
 void xml_Delete( xml_t *p_xml )
 {
-    module_Unneed( p_xml, p_xml->p_module );
-    vlc_object_detach( p_xml );
+    module_unneed( p_xml, p_xml->p_module );
     vlc_object_release( p_xml );
 }