Cleanup libxml changes for MinGW.

diff --git a/src/modules/xml/consumer_xml.c b/src/modules/xml/consumer_xml.c
index 3bcf818ec67330a28b94baf85859c809d3faed55..174aa068394807aff0e19243ed9b800b149445ee 100644 (file)
--- a/src/modules/xml/consumer_xml.c
+++ b/src/modules/xml/consumer_xml.c
@@ -752,13 +752,10 @@ static int consumer_start( mlt_consumer this )
                        xmlDocDumpMemoryEnc( doc, &buffer, &length, "utf-8" );
                        mlt_properties_set( properties, resource, _s(buffer) );
 #ifdef WIN32
-                       xmlFreeFunc myXmlFree = NULL;
-                       xmlMemGet( &myXmlFree, NULL, NULL, NULL);
-                       if ( myXmlFree )
-                               myXmlFree( buffer );
-#else
-                       xmlFree( buffer );
+                       xmlFreeFunc xmlFree = NULL;
+                       xmlMemGet( &xmlFree, NULL, NULL, NULL);
 #endif
+                       xmlFree( buffer );
                }
                else
                {

diff --git a/src/modules/xml/producer_xml.c b/src/modules/xml/producer_xml.c
index 285b9223669f71c5205d3d8544434e4065ded9bf..b7bfed8195770f4091af434f59c6bc19ebbb566c 100644 (file)
--- a/src/modules/xml/producer_xml.c
+++ b/src/modules/xml/producer_xml.c
@@ -1096,13 +1096,10 @@ static void on_end_property( deserialise_context context, const xmlChar *name )
                        xmlDocDumpMemory( context->value_doc, &value, &size );
                        mlt_properties_set( properties, context->property, _s(value) );
 #ifdef WIN32
-                       xmlFreeFunc myXmlFree = NULL;
-                       xmlMemGet( &myXmlFree, NULL, NULL, NULL);
-                       if ( myXmlFree )
-                               myXmlFree( value );
-#else
-                       xmlFree( value );
+                       xmlFreeFunc xmlFree = NULL;
+                       xmlMemGet( &xmlFree, NULL, NULL, NULL);
 #endif
+                       xmlFree( value );
                        xmlFreeDoc( context->value_doc );
                        context->value_doc = NULL;
                }