source: issm/oecreview/Archive/19101-20495/ISSM-20382-20383.diff@ 20498

Last change on this file since 20498 was 20498, checked in by Mathieu Morlighem, 9 years ago

CHG: done with Archive/19101-20495
File size: 981 bytes
RevLine 
[20498]1Index: ../trunk-jpl/src/c/shared/Numerics/constants.h
2===================================================================
3--- ../trunk-jpl/src/c/shared/Numerics/constants.h (revision 20382)
4+++ ../trunk-jpl/src/c/shared/Numerics/constants.h (revision 20383)
5@@ -22,20 +22,18 @@
6 /*Windows specific typefefs: */
7 #ifdef _INTEL_WIN_
8
9-/*Complicated way, which does not handle INFINITY though: */
10-/*#ifndef NAN
11- static const unsigned long __nan[2] = {0xffffffff, 0x7fffffff};
12- #define NAN (*(const float *) __nan)
13-#endif*/
14-
15+#ifndef NAN
16 //For reference, for Intel compile on win64
17 //#define NAN 0.0/0.0
18-//#define INFINITY 1.0/0.0
19-
20-//Most generic way it would seem:
21-#define INFINITY (DBL_MAX+DBL_MAX)
22 #define NAN (INFINITY-INFINITY)
23+#endif
24
25+#ifndef INFINITY
26+//For reference, for Intel compile on win64
27+//#define INFINITY 1.0/0.0
28+#define INFINITY (DBL_MAX+DBL_MAX)
29 #endif
30
31-#endif //ifndef _ISSMTYPEDEFS_H_
32+#endif /*_INTEL_WIN_*/
33+
34+#endif /*_ISSM_CONSTANTS_H_*/
Note: See TracBrowser for help on using the repository browser.