r15257 by jghali - fix msvc warning

[scribus-commit]

Revision: 15257
Author: jghali
Date: 2010-06-22T07:23:06.611459Z
Commit message: fix msvc warning

Changeset: 
M  /trunk/Scribus/scribus/scclocale.h

Diffs:
Index: scribus/scclocale.h
===================================================================
--- scribus/scclocale.h	(revision 15256)
+++ scribus/scclocale.h	(revision 15257)
@@ -21,14 +21,14 @@
 #include <xlocale.h>
 #endif
 
-#if defined(Q_OS_SOLARIS) or defined (Q_OS_OPENBSD)
+#if defined(Q_OS_SOLARIS) || defined (Q_OS_OPENBSD)
 #include <locale.h>
 #endif
 
 #if defined(Q_WS_WIN)
 #define XLocaleType _locale_t
 #else
-  #if defined (Q_OS_SOLARIS) or defined (Q_OS_OPENBSD)
+  #if defined (Q_OS_SOLARIS) || defined (Q_OS_OPENBSD)
   #define XLocaleType char*   //dummy?
   #else
   #define XLocaleType locale_t