r16262 by jghali - fix msvc not liking 'or' in preprocessor instruction

[scribus-commit]

Author: jghali
Date: Sun Jan 16 23:48:26 2011
New Revision: 16262

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16262
Log:
fix msvc not liking 'or' in preprocessor instruction

Modified:
    trunk/Scribus/scribus/scpaths.cpp

Modified: trunk/Scribus/scribus/scpaths.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16262&path=/trunk/Scribus/scribus/scpaths.cpp
==============================================================================
--- trunk/Scribus/scribus/scpaths.cpp (original)
+++ trunk/Scribus/scribus/scpaths.cpp Sun Jan 16 23:48:26 2011
@@ -279,7 +279,7 @@
 	sep=';';
 #endif
 	QStringList dirs;
-#if defined(Q_OS_MAC) or defined(Q_OS_UNIX)
+#if defined(Q_OS_MAC) || defined(Q_OS_UNIX)
 	QStringList env(QProcess::systemEnvironment());
 	QString path_data;
 	foreach (QString line, env)