X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FxmlParser.h;fp=kernel%2Fsrc%2FxmlParser.h;h=b6c8360cc1a71fdaa8aeab971fe9ed43b9a472de;hb=0f2b2115a28d1535f94ed108453579c166060e31;hp=b78066bcbef38eb1bdd81c21de33ba9bca7a3472;hpb=feaad5f26780e5ea143af6da2e000e7058336b36;p=bbtk.git diff --git a/kernel/src/xmlParser.h b/kernel/src/xmlParser.h index b78066b..b6c8360 100644 --- 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 #else -#define DLLENTRY + + + #if defined(WIN32) + #ifdef _MSC_VER + #define DLLENTRY + #endif + #else + #define DLLENTRY + #endif /* WIN32 */ + + + #ifndef XML_NO_WIDE_CHAR #include // to have 'wcsrtombs' for ANSI version // to have 'mbsrtowcs' for UNICODE version