fix two bugs cppcheck found

[xonotic/netradiant.git] / libs / xml / xmlparser.h

diff --git a/libs/xml/xmlparser.h b/libs/xml/xmlparser.h
index bea4557a00efcb10a01b091e34729d9206ca7cb3..8fef04f56c720c2305e1fba24347bd5a077e6e2b 100644 (file)
--- a/libs/xml/xmlparser.h
+++ b/libs/xml/xmlparser.h
@@ -99,7 +99,7 @@ public:
   }
 };
 
-#ifdef WIN32
+#ifdef _MSC_VER
 #if _MSC_VER < 1400 
 #define vsnprintf std::vsnprintf
 #endif
@@ -138,7 +138,7 @@ class XMLSAXImporter
   static void characters(void *user_data, const xmlChar *ch, int len)
   {
     reinterpret_cast<XMLSAXImporter*>(user_data)->m_importer
-      << ConvertUTF8ToLocale(StringRange(reinterpret_cast<const char*>(ch), reinterpret_cast<const char*>(ch + len)));
+      << StringRange(reinterpret_cast<const char*>(ch), reinterpret_cast<const char*>(ch + len));
   }
 
   static void warning(void *user_data, const char *msg, ...)