diff options
| author | Jose <jose@zeroc.com> | 2012-10-19 18:17:38 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-10-19 18:17:38 +0200 |
| commit | 6441d1415a9586676f23c751fe71c6f927734361 (patch) | |
| tree | 623b33d1175086a79369a87f08ff3f6199fd8e70 /cpp/src | |
| parent | Fixed ICE-4802: deprecated Qt/SQL database plugins for IceGrid and IceStorm (diff) | |
| download | ice-6441d1415a9586676f23c751fe71c6f927734361.tar.bz2 ice-6441d1415a9586676f23c751fe71c6f927734361.tar.xz ice-6441d1415a9586676f23c751fe71c6f927734361.zip | |
Fixed IceUtil\Exception.h macros for WinRT builds
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceUtil/Exception.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/Exception.cpp index eda8311b19f..c90b6bb9879 100644 --- a/cpp/src/IceUtil/Exception.cpp +++ b/cpp/src/IceUtil/Exception.cpp @@ -7,14 +7,14 @@ // // ********************************************************************** -#if !defined(ICE_OS_WINRT) && defined(_MSC_VER) && _MSC_VER >= 1700 +#if defined(_MSC_VER) && _MSC_VER >= 1700 // // DbgHelp.dll on Windows XP does not contain Unicode functions, so we // "switch on" Unicode only with VS2012 and up // -# define UNICODE -# define DBGHELP_TRANSLATE_TCHAR -# include <IceUtil/Unicode.h> +# ifndef UNICODE +# define UNICODE +# endif #endif #include <IceUtil/Exception.h> @@ -34,6 +34,10 @@ #endif #if defined(_WIN32) && !defined(__MINGW32__) && !defined(ICE_OS_WINRT) +# if defined(_MSC_VER) && _MSC_VER >= 1700 +# define DBGHELP_TRANSLATE_TCHAR +# include <IceUtil/Unicode.h> +# endif # include <DbgHelp.h> # define ICE_STACK_TRACES # define ICE_WIN32_STACK_TRACES |