diff options
| author | Bernard Normier <bernard@zeroc.com> | 2018-10-30 15:03:36 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2018-10-30 15:03:36 -0400 |
| commit | 6d22484ff43d37bdac0db3d4e48fc6e688835f27 (patch) | |
| tree | d5e9d697ef50a3d3f0616c3cafec6e076213b987 /cpp/src/IceUtil/UtilException.cpp | |
| parent | Added dependency on natives 1.1.6 to workaround issue with NodeJS 11, see #264 (diff) | |
| download | ice-6d22484ff43d37bdac0db3d4e48fc6e688835f27.tar.bz2 ice-6d22484ff43d37bdac0db3d4e48fc6e688835f27.tar.xz ice-6d22484ff43d37bdac0db3d4e48fc6e688835f27.zip | |
Removed Slice compiler dependency on DbhHelp on Windows
Diffstat (limited to 'cpp/src/IceUtil/UtilException.cpp')
| -rw-r--r-- | cpp/src/IceUtil/UtilException.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/IceUtil/UtilException.cpp b/cpp/src/IceUtil/UtilException.cpp index 0eb8d890f3b..b2c238be5ad 100644 --- a/cpp/src/IceUtil/UtilException.cpp +++ b/cpp/src/IceUtil/UtilException.cpp @@ -56,7 +56,10 @@ # endif #endif -#if defined(_WIN32) && !defined(ICE_OS_UWP) && !defined(__MINGW32__) +// +// The Slice compilers don't retrieve the exception stack traces so we don't need the DbgHelp calls. +// +#if defined(_WIN32) && !defined(ICE_OS_UWP) && !defined(__MINGW32__) && !defined(ICE_BUILDING_SLICE_COMPILERS) # define ICE_DBGHELP # if defined(_MSC_VER) && (_MSC_VER >= 1700) # define DBGHELP_TRANSLATE_TCHAR |