From e6432710d8a586386b3c7025e845cf4f80830da3 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 25 Jan 2012 08:24:51 +0100
Subject: mesa git update 25 jan 2012

---
 mesalib/src/mesa/main/imports.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mesalib/src/mesa/main/imports.c')

diff --git a/mesalib/src/mesa/main/imports.c b/mesalib/src/mesa/main/imports.c
index bbc6ac6e2..82713a13b 100644
--- a/mesalib/src/mesa/main/imports.c
+++ b/mesalib/src/mesa/main/imports.c
@@ -764,7 +764,7 @@ float
 _mesa_strtof( const char *s, char **end )
 {
 #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
-    !defined(ANDROID)
+   !defined(ANDROID) && !defined(__HAIKU__)
    static locale_t loc = NULL;
    if (!loc) {
       loc = newlocale(LC_CTYPE_MASK, "C", NULL);
-- 
cgit v1.2.3