projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8c879ac
)
util: Don't attempt to redefine INFINITY/NAN on VS 2013.
author
José Fonseca
<jfonseca@vmware.com>
Thu, 1 May 2014 13:17:51 +0000
(14:17 +0100)
committer
José Fonseca
<jfonseca@vmware.com>
Fri, 2 May 2014 21:04:47 +0000
(22:04 +0100)
There are now provided by VS.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
src/gallium/auxiliary/util/u_math.h
patch
|
blob
|
history
diff --git
a/src/gallium/auxiliary/util/u_math.h
b/src/gallium/auxiliary/util/u_math.h
index a60e1830a7233c83a85cfd9404d5f9237b034ef4..2ade64af4fec4118d5f261052b54ca6c4a0c23f3 100644
(file)
--- 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 */