diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-31 10:17:14 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-31 10:17:14 +0200 |
| commit | 83da3ad0287bc51cd16ee6911fe73dc98ebe000b (patch) | |
| tree | 48d48590a0b0a3770006aeda8ec2b2a45054d1f1 /mesalib/src/gallium | |
| parent | 00e30605ffc7ac3cf1a091ff2c1f46cfefb780d7 (diff) | |
| parent | bd27b3d008b0abf9ae2edcb127302728808533e4 (diff) | |
| download | vcxsrv-83da3ad0287bc51cd16ee6911fe73dc98ebe000b.tar.gz vcxsrv-83da3ad0287bc51cd16ee6911fe73dc98ebe000b.tar.bz2 vcxsrv-83da3ad0287bc51cd16ee6911fe73dc98ebe000b.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/gallium')
| -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. |