diff options
| author | Anthony G. Basile <[email protected]> | 2012-07-24 12:59:54 -0700 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2012-07-24 13:00:47 -0700 |
| commit | f35e380dd240b418e17a179af73bbab74ceea784 (patch) | |
| tree | 73d09f686239d1b079d363d901370761db932f6d | |
| parent | 1ffac44e83a6fa6f486c6493e1d4eda259938ebb (diff) | |
Fix compile time errors when building against uclibc
Mesa misses a few checks when compiling on a uclibc system
which cause it to fall back on glibc-ism. This patch
addresses those issues.
Acked-by: Kenneth Graunke <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Signed-off-by: Anthony G. Basile <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/util/u_debug_symbol.c | 2 | ||||
| -rw-r--r-- | src/glsl/strtod.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/imports.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/util/u_debug_symbol.c b/src/gallium/auxiliary/util/u_debug_symbol.c index bae9be87a26..3d2f8ebc31b 100644 --- a/src/gallium/auxiliary/util/u_debug_symbol.c +++ b/src/gallium/auxiliary/util/u_debug_symbol.c @@ -152,7 +152,9 @@ debug_symbol_name_dbghelp(const void *addr, char* buf, unsigned size) #endif #ifdef __GLIBC__ +#ifndef __UCLIBC__ #include <execinfo.h> +#endif /* This can only provide dynamic symbols, or binary offsets into a file. * diff --git a/src/glsl/strtod.c b/src/glsl/strtod.c index a876e138b70..47c1f0ed69c 100644 --- a/src/glsl/strtod.c +++ b/src/glsl/strtod.c @@ -45,7 +45,7 @@ double glsl_strtod(const char *s, char **end) { #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \ - !defined(__HAIKU__) + !defined(__HAIKU__) && !defined(__UCLIBC__) static locale_t loc = NULL; if (!loc) { loc = newlocale(LC_CTYPE_MASK, "C", NULL); diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c index 444de875cf7..0d6b56a518a 100644 --- a/src/mesa/main/imports.c +++ b/src/mesa/main/imports.c @@ -542,7 +542,7 @@ float _mesa_strtof( const char *s, char **end ) { #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \ - !defined(ANDROID) && !defined(__HAIKU__) + !defined(ANDROID) && !defined(__HAIKU__) && !defined(__UCLIBC__) static locale_t loc = NULL; if (!loc) { loc = newlocale(LC_CTYPE_MASK, "C", NULL); |