r18161 by craig - Fix Haiku oops

[scribus-commit]

Author: craig
Date: Sun Feb 24 21:48:22 2013
New Revision: 18161

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18161
Log:
Fix Haiku oops

Modified:
    branches/Version14x/Scribus/scribus/scclocale.cpp

Modified: branches/Version14x/Scribus/scribus/scclocale.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18161&path=/branches/Version14x/Scribus/scribus/scclocale.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scclocale.cpp (original)
+++ branches/Version14x/Scribus/scribus/scclocale.cpp Sun Feb 24 21:48:22 2013
@@ -110,7 +110,7 @@
 #if defined(Q_WS_WIN)
 		return _strtod_l(str, endptr, that()->cLocale);
 #else
-  #if defined(Q_OS_SOLARIS) or defined (Q_OS_OPENBSD) or defined (Q_OS_FREEBSD) and not defined (Q_OS_HAIKU)
+  #if defined(Q_OS_SOLARIS) or defined (Q_OS_OPENBSD) or defined (Q_OS_FREEBSD) or defined (Q_OS_HAIKU)
 		char *oldlocale=setlocale(LC_NUMERIC, NULL);
 		double result(0.0);
 		setlocale(LC_NUMERIC, "C");