From 37f0b875adabbd04c418b7b301eea7d930293d52 Mon Sep 17 00:00:00 2001 From: Alberto Massari <amassari@apache.org> Date: Wed, 26 Jan 2005 14:48:14 +0000 Subject: [PATCH] If the option /Zc:wchar_t is specified, map XMLCh to wchar_t, or trying to use wide-char Windows API will generate compiler errors (jira# 413) git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@176298 13f79535-47bb-0310-9956-ffa450edef68 --- src/xercesc/util/Compilers/VCPPDefs.hpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/xercesc/util/Compilers/VCPPDefs.hpp b/src/xercesc/util/Compilers/VCPPDefs.hpp index 36fd27e88..19b21a7d8 100644 --- a/src/xercesc/util/Compilers/VCPPDefs.hpp +++ b/src/xercesc/util/Compilers/VCPPDefs.hpp @@ -16,6 +16,9 @@ /* * $Log$ + * Revision 1.12 2005/01/26 14:48:14 amassari + * If the option /Zc:wchar_t is specified, map XMLCh to wchar_t, or trying to use wide-char Windows API will generate compiler errors (jira# 413) + * * Revision 1.11 2004/11/15 13:30:40 amassari * Add build target for VC7.1 to create a static library * @@ -146,7 +149,11 @@ // --------------------------------------------------------------------------- // Define our version of the XML character // --------------------------------------------------------------------------- +#ifdef _NATIVE_WCHAR_T_DEFINED +typedef wchar_t XMLCh; +#else typedef unsigned short XMLCh; +#endif // --------------------------------------------------------------------------- // Define unsigned 16 and 32 bits integers -- GitLab