r22411 by jghali -

[scribus-commit]

Author: jghali
Date: Sun Feb 25 17:39:40 2018
New Revision: 22411

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22411
Log:
fix 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=22411&path=/trunk/Scribus/scribus/scimagecachedir.cpp
==============================================================================
--- trunk/Scribus/scribus/scimagecachedir.cpp	(original)
+++ trunk/Scribus/scribus/scimagecachedir.cpp	Sun Feb 25 17:39:40 2018
@@ -30,7 +30,9 @@
 #include "scimagecachemanager.h"
 #include "scpaths.h"
 
-#define SC_DEBUG_FILE defined(DEBUG_SCIMAGECACHE)
+#if defined(DEBUG_SCIMAGECACHE)
+#define SC_DEBUG_FILE 1
+#endif
 #include "scdebug.h"
 
 const QString ScImageCacheDir::accessFileName("access");

Modified: trunk/Scribus/scribus/scimagecachefile.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22411&path=/trunk/Scribus/scribus/scimagecachefile.cpp
==============================================================================
--- trunk/Scribus/scribus/scimagecachefile.cpp	(original)
+++ trunk/Scribus/scribus/scimagecachefile.cpp	Sun Feb 25 17:39:40 2018
@@ -23,7 +23,9 @@
 #include "scimagecachedir.h"
 #include "scimagecachefile.h"
 
-#define SC_DEBUG_FILE defined(DEBUG_SCIMAGECACHE)
+#if defined(DEBUG_SCIMAGECACHE)
+#define SC_DEBUG_FILE 1
+#endif
 #include "scdebug.h"
 
 ScImageCacheFile::ScImageCacheFile(const QString & name, ScImageCacheDir *parent)

Modified: trunk/Scribus/scribus/scimagecachemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22411&path=/trunk/Scribus/scribus/scimagecachemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/scimagecachemanager.cpp	(original)
+++ trunk/Scribus/scribus/scimagecachemanager.cpp	Sun Feb 25 17:39:40 2018
@@ -32,7 +32,9 @@
 #include "scimagecachewriteaction.h"
 #include "scpaths.h"
 
-#define SC_DEBUG_FILE defined(DEBUG_SCIMAGECACHE)
+#if defined(DEBUG_SCIMAGECACHE)
+#define SC_DEBUG_FILE 1
+#endif
 #include "scdebug.h"
 
 /*!

Modified: trunk/Scribus/scribus/scimagecacheproxy.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22411&path=/trunk/Scribus/scribus/scimagecacheproxy.cpp
==============================================================================
--- trunk/Scribus/scribus/scimagecacheproxy.cpp	(original)
+++ trunk/Scribus/scribus/scimagecacheproxy.cpp	Sun Feb 25 17:39:40 2018
@@ -34,7 +34,9 @@
 #include "scpaths.h"
 #include "util_file.h"
 
-#define SC_DEBUG_FILE defined(DEBUG_SCIMAGECACHE)
+#if defined(DEBUG_SCIMAGECACHE)
+#define SC_DEBUG_FILE 1
+#endif
 #include "scdebug.h"
 
 // MD5 has been chosen as a hash algorithm as it less prone to collisions than MD4,

Modified: trunk/Scribus/scribus/scimagecachewriteaction.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22411&path=/trunk/Scribus/scribus/scimagecachewriteaction.cpp
==============================================================================
--- trunk/Scribus/scribus/scimagecachewriteaction.cpp	(original)
+++ trunk/Scribus/scribus/scimagecachewriteaction.cpp	Sun Feb 25 17:39:40 2018
@@ -22,7 +22,9 @@
 #include "scimagecachemanager.h"
 #include "scimagecachewriteaction.h"
 
-#define SC_DEBUG_FILE defined(DEBUG_SCIMAGECACHE)
+#if defined(DEBUG_SCIMAGECACHE)
+#define SC_DEBUG_FILE 1
+#endif
 #include "scdebug.h"
 
 ScImageCacheWriteAction::ScImageCacheWriteAction(bool haveMasterLock)