Removed redundant DSPs

[wxWidgets.git] / src / xml / xml.cpp

diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index 3b59fcf271b3dafa81fad6a563e327ff0a942717..7fc49292a2c6eadf6da4eb927ad261b345312d00 100644 (file)
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "xml.h"
 #endif
 
@@ -32,6 +32,10 @@
 
 #include "expat.h" // from Expat
 
+// DLL options compatibility check:
+#include "wx/app.h"
+WX_CHECK_BUILD_OPTIONS("wxXML")
+
 //-----------------------------------------------------------------------------
 //  wxXmlNode
 //-----------------------------------------------------------------------------
@@ -356,7 +360,7 @@ inline static wxString CharToString(wxMBConv *conv,
     if ( conv )
     {
         size_t nLen = (len != wxSTRING_MAXLEN) ? len :
-                          nLen = wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0);
+                          wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0);
 
         wchar_t *buf = new wchar_t[nLen+1];
         wxConvUTF8.MB2WC(buf, s, nLen);