r22418 by jghali -

[scribus-commit]

Author: jghali
Date: Tue Feb 27 11:50:25 2018
New Revision: 22418

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22418
Log:
better fix for gcc warning: "macro expansion producing 'defined' has undefined behavior"

Modified:
    trunk/Scribus/scribus/scimagecachedir.cpp
    trunk/Scribus/scribus/scimagecachefile.cpp
    trunk/Scribus/scribus/scimagecachemanager.cpp
    trunk/Scribus/scribus/scimagecacheproxy.cpp
    trunk/Scribus/scribus/scimagecachewriteaction.cpp

Modified: trunk/Scribus/scribus/scimagecachedir.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22418&path=/trunk/Scribus/scribus/scimagecachedir.cpp
==============================================================================
--- trunk/Scribus/scribus/scimagecachedir.cpp	(original)
+++ trunk/Scribus/scribus/scimagecachedir.cpp	Tue Feb 27 11:50:25 2018
@@ -32,6 +32,8 @@
 
 #if defined(DEBUG_SCIMAGECACHE)
 #define SC_DEBUG_FILE 1
+#else
+#define SC_DEBUG_FILE 0
 #endif
 #include "scdebug.h"
 

Modified: trunk/Scribus/scribus/scimagecachefile.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22418&path=/trunk/Scribus/scribus/scimagecachefile.cpp
==============================================================================
--- trunk/Scribus/scribus/scimagecachefile.cpp	(original)
+++ trunk/Scribus/scribus/scimagecachefile.cpp	Tue Feb 27 11:50:25 2018
@@ -25,6 +25,8 @@
 
 #if defined(DEBUG_SCIMAGECACHE)
 #define SC_DEBUG_FILE 1
+#else
+#define SC_DEBUG_FILE 0
 #endif
 #include "scdebug.h"
 

Modified: trunk/Scribus/scribus/scimagecachemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22418&path=/trunk/Scribus/scribus/scimagecachemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/scimagecachemanager.cpp	(original)
+++ trunk/Scribus/scribus/scimagecachemanager.cpp	Tue Feb 27 11:50:25 2018
@@ -34,6 +34,8 @@
 
 #if defined(DEBUG_SCIMAGECACHE)
 #define SC_DEBUG_FILE 1
+#else
+#define SC_DEBUG_FILE 0
 #endif
 #include "scdebug.h"
 

Modified: trunk/Scribus/scribus/scimagecacheproxy.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22418&path=/trunk/Scribus/scribus/scimagecacheproxy.cpp
==============================================================================
--- trunk/Scribus/scribus/scimagecacheproxy.cpp	(original)
+++ trunk/Scribus/scribus/scimagecacheproxy.cpp	Tue Feb 27 11:50:25 2018
@@ -36,6 +36,8 @@
 
 #if defined(DEBUG_SCIMAGECACHE)
 #define SC_DEBUG_FILE 1
+#else
+#define SC_DEBUG_FILE 0
 #endif
 #include "scdebug.h"
 

Modified: trunk/Scribus/scribus/scimagecachewriteaction.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22418&path=/trunk/Scribus/scribus/scimagecachewriteaction.cpp
==============================================================================
--- trunk/Scribus/scribus/scimagecachewriteaction.cpp	(original)
+++ trunk/Scribus/scribus/scimagecachewriteaction.cpp	Tue Feb 27 11:50:25 2018
@@ -24,6 +24,8 @@
 
 #if defined(DEBUG_SCIMAGECACHE)
 #define SC_DEBUG_FILE 1
+#else
+#define SC_DEBUG_FILE 0
 #endif
 #include "scdebug.h"