Mesa (master): glsl: Don't use newlocale on Haiku
Brian Paul
brianp at kemper.freedesktop.org
Tue Jan 24 18:16:22 UTC 2012
Module: Mesa
Branch: master
Commit: 873f3ae92e1d8a17ea228b38b4c20346d54ae045
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=873f3ae92e1d8a17ea228b38b4c20346d54ae045
Author: Alexander von Gluck <kallisti5 at unixzen.com>
Date: Sun Jan 22 12:42:38 2012 -0600
glsl: Don't use newlocale on Haiku
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Brian Paul <brianp at vmware.com>
---
src/glsl/strtod.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/glsl/strtod.c b/src/glsl/strtod.c
index ff34591..a876e13 100644
--- a/src/glsl/strtod.c
+++ b/src/glsl/strtod.c
@@ -44,7 +44,8 @@
double
glsl_strtod(const char *s, char **end)
{
-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
+ !defined(__HAIKU__)
static locale_t loc = NULL;
if (!loc) {
loc = newlocale(LC_CTYPE_MASK, "C", NULL);
More information about the mesa-commit
mailing list