From: José Fonseca <jfonseca@vmware.com>
Date: Thu, 1 May 2014 13:17:51 +0000 (+0100)
Subject: util: Don't attempt to redefine INFINITY/NAN on VS 2013.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7ebdc9e48c99a92475b48668284695663e871f7d;p=mesa.git

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>
---

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 */