#3203 BBTK Feature New Normal vtk7itk4wx3-mingw64

[bbtk.git] / kernel / src / xmlParser.h

diff --git a/kernel/src/xmlParser.h b/kernel/src/xmlParser.h
index b78066bcbef38eb1bdd81c21de33ba9bca7a3472..b6c8360cc1a71fdaa8aeab971fe9ed43b9a472de 100644 (file)
--- a/kernel/src/xmlParser.h
+++ b/kernel/src/xmlParser.h
@@ -92,9 +92,9 @@
 
 #ifdef _USE_XMLPARSER_DLL
  #ifdef _DLL_EXPORTS_
-   #define DLLENTRY __declspec(dllexport)
+       #define DLLENTRY __declspec(dllexport)
  #else
-   #define DLLENTRY __declspec(dllimport)
+        #define DLLENTRY __declspec(dllimport)
  #endif /* _DLL_EXPORTS_ */ 
 #else
   #define DLLENTRY
@@ -111,8 +111,11 @@
 // ==> I try a '#if'
 //
 #if defined(WIN32)
+       #ifndef _MSC_VER
+       #define XML_NO_WIDE_CHAR
+       #endif
 #else
-  #define XML_NO_WIDE_CHAR
+       #define XML_NO_WIDE_CHAR
 #endif /* WIN32 */
 
 #ifdef XML_NO_WIDE_CHAR
@@ -123,7 +126,18 @@
 #ifdef _XMLWINDOWS
 #include <tchar.h>
 #else
-#define DLLENTRY
+
+       
+       #if defined(WIN32)
+               #ifdef _MSC_VER
+                       #define DLLENTRY
+               #endif
+       #else
+               #define DLLENTRY
+       #endif /* WIN32 */
+
+
+
 #ifndef XML_NO_WIDE_CHAR
 #include <wchar.h> // to have 'wcsrtombs' for ANSI version
                    // to have 'mbsrtowcs' for UNICODE version