diff options
author | marha <marha@users.sourceforge.net> | 2013-07-22 14:48:36 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-07-22 14:48:36 +0200 |
commit | 81d811ac780a2524fff09a516b6f0212c3f209a2 (patch) | |
tree | 0607523b8ebef04e930cdbf538274c59f983cd07 /mesalib/src/gallium/auxiliary | |
parent | cde797e5f774a44b89e51da0f32472329eac06cb (diff) | |
parent | b6aadb8490bdacf33196fa0898fe1247b9a8ee2c (diff) | |
download | vcxsrv-81d811ac780a2524fff09a516b6f0212c3f209a2.tar.gz vcxsrv-81d811ac780a2524fff09a516b6f0212c3f209a2.tar.bz2 vcxsrv-81d811ac780a2524fff09a516b6f0212c3f209a2.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa git update 22 Jul 2013
Diffstat (limited to 'mesalib/src/gallium/auxiliary')
-rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_math.h | 4 |
1 files changed, 4 insertions, 0 deletions
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 <math.h> +#include <float.h> #include <stdarg.h> #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 */ |