r15206 by cbradney - #9131: Add generic C locale support for OpenBSD
scribus-commit
scribus-commit at lists.scribus.net
Thu Jun 17 21:20:43 CEST 2010
Revision: 15206
Author: cbradney
Date: 2010-06-17T19:12:46.017988Z
Commit message: #9131: Add generic C locale support for OpenBSD
Changeset:
M /branches/Version135/Scribus/scribus/scclocale.cpp
M /branches/Version135/Scribus/scribus/scclocale.h
Diffs:
Index: scribus/scclocale.h
===================================================================
--- scribus/scclocale.h (revision 15205)
+++ scribus/scclocale.h (revision 15206)
@@ -21,14 +21,14 @@
#include <xlocale.h>
#endif
-#if defined(Q_OS_SOLARIS)
+#if defined(Q_OS_SOLARIS) or defined (Q_OS_OPENBSD)
#include <locale.h>
#endif
#if defined(Q_WS_WIN)
#define XLocaleType _locale_t
#else
- #if defined (Q_OS_SOLARIS)
+ #if defined (Q_OS_SOLARIS) or defined (Q_OS_OPENBSD)
#define XLocaleType char* //dummy?
#else
#define XLocaleType locale_t
Index: scribus/scclocale.cpp
===================================================================
--- scribus/scclocale.cpp (revision 15205)
+++ scribus/scclocale.cpp (revision 15206)
@@ -22,7 +22,7 @@
#if defined(Q_WS_WIN)
cLocale = _create_locale(LC_ALL, "C");
#else
- #if not defined(Q_OS_SOLARIS)
+ #if not defined(Q_OS_SOLARIS) and not defined(Q_OS_OPENBSD)
cLocale = newlocale(LC_ALL_MASK, "C", NULL);
#endif
#endif
@@ -33,7 +33,7 @@
#if defined(Q_WS_WIN)
_free_locale(cLocale);
#else
- #if not defined(Q_OS_SOLARIS)
+ #if not defined(Q_OS_SOLARIS) and not defined(Q_OS_OPENBSD)
freelocale(cLocale);
#endif
#endif
@@ -108,7 +108,7 @@
#if defined(Q_WS_WIN)
return _strtod_l(str, endptr, that()->cLocale);
#else
- #if defined(Q_OS_SOLARIS)
+ #if defined(Q_OS_SOLARIS) or defined (Q_OS_OPENBSD)
char *oldlocale=setlocale(LC_NUMERIC, NULL);
double result(0.0);
setlocale(LC_NUMERIC, "C");
More information about the scribus-commit
mailing list