X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=kernel%2Fsrc%2FxmlParser.h;h=b6c8360cc1a71fdaa8aeab971fe9ed43b9a472de;hb=4d6822024afbbe783cdd620e248184b37d84c540;hp=ac98af71dead4e9db6b321834dcbc4e3f027f876;hpb=a26195c366a89795288009cf7e20f11afa494970;p=bbtk.git diff --git a/kernel/src/xmlParser.h b/kernel/src/xmlParser.h index ac98af7..b6c8360 100644 --- a/kernel/src/xmlParser.h +++ b/kernel/src/xmlParser.h @@ -1,3 +1,30 @@ +/* + # --------------------------------------------------------------------- + # + # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image + # pour la SantÃ) + # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton + # Previous Authors : Laurent Guigues, Jean-Pierre Roux + # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil + # + # This software is governed by the CeCILL-B license under French law and + # abiding by the rules of distribution of free software. You can use, + # modify and/ or redistribute the software under the terms of the CeCILL-B + # license as circulated by CEA, CNRS and INRIA at the following URL + # http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html + # or in the file LICENSE.txt. + # + # As a counterpart to the access to the source code and rights to copy, + # modify and redistribute granted by the license, users are provided only + # with a limited warranty and the software's author, the holder of the + # economic rights, and the successive licensors have only limited + # liability. + # + # The fact that you are presently reading this means that you have had + # knowledge of the CeCILL-B license and that you accept its terms. + # ------------------------------------------------------------------------ */ + + /** **************************************************************************** *
XML.c - implementation file for basic XML parser written in ANSI C++
@@ -65,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
@@ -84,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
@@ -96,7 +126,18 @@
#ifdef _XMLWINDOWS
#include