diff options
author | marha <marha@users.sourceforge.net> | 2012-07-31 10:00:43 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-07-31 10:00:43 +0200 |
commit | bd27b3d008b0abf9ae2edcb127302728808533e4 (patch) | |
tree | a73a74f04a31a0f44465ed82bcf58b180ca53dbd /mesalib/src/gallium/auxiliary | |
parent | 2ff5448bcca8cba4b62026d5493cb08aaf2838d8 (diff) | |
download | vcxsrv-bd27b3d008b0abf9ae2edcb127302728808533e4.tar.gz vcxsrv-bd27b3d008b0abf9ae2edcb127302728808533e4.tar.bz2 vcxsrv-bd27b3d008b0abf9ae2edcb127302728808533e4.zip |
fontconfig libXext mesa xserver pixman git update 31 Jul 2012
Diffstat (limited to 'mesalib/src/gallium/auxiliary')
-rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_debug_symbol.c | 2 | ||||
-rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_format_tests.c | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_debug_symbol.c b/mesalib/src/gallium/auxiliary/util/u_debug_symbol.c index bae9be87a..3d2f8ebc3 100644 --- a/mesalib/src/gallium/auxiliary/util/u_debug_symbol.c +++ b/mesalib/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/mesalib/src/gallium/auxiliary/util/u_format_tests.c b/mesalib/src/gallium/auxiliary/util/u_format_tests.c index 457fda6c8..d34860886 100644 --- a/mesalib/src/gallium/auxiliary/util/u_format_tests.c +++ b/mesalib/src/gallium/auxiliary/util/u_format_tests.c @@ -66,8 +66,13 @@ {{ 0, 0, 0, 0}, { 0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}}} +#ifdef __GNUC__ +#define NAN __builtin_nan("") +#define INF __builtin_inf() +#else #define NAN (0.0 / 0.0) #define INF (1.0 / 0.0) +#endif /** * Test cases. |