From b6aadb8490bdacf33196fa0898fe1247b9a8ee2c Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 22 Jul 2013 14:47:25 +0200 Subject: libX11 mesa git update 22 Jul 2013 libX11 commit 24d3ee0d08f24e23c91d55702f010f73d7b908e5 mesa commit 190312949e8ce2c1dc884d4db5d6a44511666641 --- mesalib/src/gallium/auxiliary/util/u_math.h | 4 ++++ mesalib/src/glsl/glsl_parser_extras.cpp | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'mesalib/src') diff --git a/mesalib/src/gallium/auxiliary/util/u_math.h b/mesalib/src/gallium/auxiliary/util/u_math.h index bc3948875..702d4e9d4 100644 --- a/mesalib/src/gallium/auxiliary/util/u_math.h +++ b/mesalib/src/gallium/auxiliary/util/u_math.h @@ -48,6 +48,7 @@ extern "C" { #include +#include #include #ifdef PIPE_OS_UNIX @@ -133,6 +134,9 @@ roundf(float x) return x >= 0.0f ? floorf(x + 0.5f) : ceilf(x - 0.5f); } +#define INFINITY (DBL_MAX + DBL_MAX) +#define NAN (INFINITY - INFINITY) + #endif /* _MSC_VER */ diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp index 84c477773..ec4e3196b 100644 --- a/mesalib/src/glsl/glsl_parser_extras.cpp +++ b/mesalib/src/glsl/glsl_parser_extras.cpp @@ -1115,7 +1115,8 @@ ast_function::print(void) const ast_function::ast_function(void) - : is_definition(false), signature(NULL) + : return_type(NULL), identifier(NULL), is_definition(false), + signature(NULL) { /* empty */ } -- cgit v1.2.3