[icinga-checkins] icinga.org: icinga2/feature/choco: Build fix for Windows

git at icinga.org git at icinga.org
Wed Aug 31 13:41:17 CEST 2016


Module: icinga2
Branch: feature/choco
Commit: ba14c6e7ff780e42ed0761a89dfc6747a88f5ca5
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=ba14c6e7ff780e42ed0761a89dfc6747a88f5ca5

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Wed Aug 31 13:24:57 2016 +0200

Build fix for Windows

refs #9182

---

 lib/base/exception.cpp |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/base/exception.cpp b/lib/base/exception.cpp
index 3f3ec9e..2b21a46 100644
--- a/lib/base/exception.cpp
+++ b/lib/base/exception.cpp
@@ -93,11 +93,11 @@ extern "C" I2_EXPORT void __cxa_throw(void *obj, TYPEINFO_TYPE *pvtinfo, void (*
 
 void icinga::RethrowUncaughtException(void)
 {
-#if defined(__GLIBCXX__) && !defined(_WIN32)
+#if defined(__GLIBCXX__) || !defined(HAVE_CXXABI_H)
 	throw;
-#else /* __GLIBCXX__ || _WIN32 */
+#else /* __GLIBCXX__ || !HAVE_CXXABI_H */
 	__cxa_throw(*l_LastExceptionObj.get(), *l_LastExceptionPvtInfo.get(), *l_LastExceptionDest.get());
-#endif /* __GLIBCXX__ || _WIN32 */
+#endif /* __GLIBCXX__ || !HAVE_CXXABI_H */
 }
 
 #ifdef HAVE_CXXABI_H



More information about the icinga-checkins mailing list