summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GException.h2
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GThreads.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/kviewshell/plugins/djvu/libdjvu/GException.h b/kviewshell/plugins/djvu/libdjvu/GException.h
index 41a8b9a8..2df26894 100644
--- a/kviewshell/plugins/djvu/libdjvu/GException.h
+++ b/kviewshell/plugins/djvu/libdjvu/GException.h
@@ -229,7 +229,7 @@ private:
#if defined(_MSC_VER)
#define CPP_SUPPORTS_EXCEPTIONS
#endif
-#if defined(__EXCEPTIONS)
+#ifndef Q_NO_EXCEPTIONS
#define CPP_SUPPORTS_EXCEPTIONS
#endif
// Decide which exception model to use
diff --git a/kviewshell/plugins/djvu/libdjvu/GThreads.cpp b/kviewshell/plugins/djvu/libdjvu/GThreads.cpp
index 2e96d887..3bbe6fb8 100644
--- a/kviewshell/plugins/djvu/libdjvu/GThreads.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GThreads.cpp
@@ -661,7 +661,7 @@ GThread::start(void *arg)
#endif
#endif
// Catch exceptions
-#ifdef __EXCEPTIONS
+#ifndef Q_NO_EXCEPTIONS
try
{
#endif
@@ -678,7 +678,7 @@ GThread::start(void *arg)
#endif
}
G_ENDCATCH;
-#ifdef __EXCEPTIONS
+#ifndef Q_NO_EXCEPTIONS
}
catch(...)
{
@@ -1568,7 +1568,7 @@ starttwo(GThread *thr)
// an exception context pointer. Therefore
// we can register the exception handlers.
// It is placed after ``startone'' to avoid inlining.
-#ifdef __EXCEPTIONS
+#ifndef Q_NO_EXCEPTIONS
try
{
#endif
@@ -1585,7 +1585,7 @@ starttwo(GThread *thr)
#endif
}
G_ENDCATCH;
-#ifdef __EXCEPTIONS
+#ifndef Q_NO_EXCEPTIONS
}
catch(...)
{