diff options
| author | Jose <jose@zeroc.com> | 2016-03-21 21:42:51 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-03-21 21:42:51 +0100 |
| commit | 6b1636ceb0bf0ef9936fa3fcc390a04e5df68da4 (patch) | |
| tree | 2f5353fb6c9d8e546385f0ec69420929b1d5c7ae | |
| parent | version fixes (diff) | |
| download | ice-6b1636ceb0bf0ef9936fa3fcc390a04e5df68da4.tar.bz2 ice-6b1636ceb0bf0ef9936fa3fcc390a04e5df68da4.tar.xz ice-6b1636ceb0bf0ef9936fa3fcc390a04e5df68da4.zip | |
Exception stack trace updates
| -rw-r--r-- | cpp/src/IceUtil/Exception.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/IceUtil/stacktrace/Client.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/Exception.cpp index 7b654a5d090..2966ed42eda 100644 --- a/cpp/src/IceUtil/Exception.cpp +++ b/cpp/src/IceUtil/Exception.cpp @@ -30,7 +30,7 @@ #if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__) && !defined(__MINGW32__) && \ - !(defined(__ARMEL__) && defined(__linux)) + !defined(ICE_STATIC_LIBS) # include <execinfo.h> # include <cxxabi.h> # define ICE_GCC_STACK_TRACES diff --git a/cpp/test/IceUtil/stacktrace/Client.cpp b/cpp/test/IceUtil/stacktrace/Client.cpp index 7e04dcb6e87..81f8bdf4ee2 100644 --- a/cpp/test/IceUtil/stacktrace/Client.cpp +++ b/cpp/test/IceUtil/stacktrace/Client.cpp @@ -16,7 +16,7 @@ using namespace IceUtil; using namespace std; #if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__) && !defined(__MINGW32__) && \ - !(defined(__ARMEL__) && defined(__linux)) + !defined(ICE_STATIC_LIBS) # define HAS_STACK_TRACES #endif |