diff options
| author | José Fonseca <jfonseca@vmware.com> | 2014-05-01 14:17:51 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2014-05-02 22:04:47 +0100 |
| commit | 7ebdc9e48c99a92475b48668284695663e871f7d (patch) | |
| tree | 00fdc3eeed6288f3f637c08c6a8e384e24ee6c44 /src/gallium/auxiliary/util | |
| parent | 8c879ac1977a265ae513a5569ee3af35dbc6b1aa (diff) | |
util: Don't attempt to redefine INFINITY/NAN on VS 2013.
There are now provided by VS.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Diffstat (limited to 'src/gallium/auxiliary/util')
| -rw-r--r-- | src/gallium/auxiliary/util/u_math.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h index a60e1830a72..2ade64af4fe 100644 --- a/src/gallium/auxiliary/util/u_math.h +++ b/src/gallium/auxiliary/util/u_math.h @@ -138,8 +138,13 @@ roundf(float x) } #endif +#ifndef INFINITY #define INFINITY (DBL_MAX + DBL_MAX) +#endif + +#ifndef NAN #define NAN (INFINITY - INFINITY) +#endif #endif /* _MSC_VER */ |