Index: ../trunk-jpl/src/c/shared/Numerics/constants.h
===================================================================
--- ../trunk-jpl/src/c/shared/Numerics/constants.h	(revision 20382)
+++ ../trunk-jpl/src/c/shared/Numerics/constants.h	(revision 20383)
@@ -22,20 +22,18 @@
 /*Windows specific typefefs: */
 #ifdef _INTEL_WIN_
 
-/*Complicated way, which does not handle INFINITY though: */
-/*#ifndef NAN
-	static const unsigned long __nan[2] = {0xffffffff, 0x7fffffff};
-	#define NAN (*(const float *) __nan)
-#endif*/
-
+#ifndef NAN
 //For reference, for Intel compile on win64
 //#define NAN 0.0/0.0 
-//#define INFINITY 1.0/0.0
-
-//Most generic way it would seem:
-#define INFINITY (DBL_MAX+DBL_MAX)
 #define NAN (INFINITY-INFINITY)
+#endif
 
+#ifndef INFINITY
+//For reference, for Intel compile on win64
+//#define INFINITY 1.0/0.0
+#define INFINITY (DBL_MAX+DBL_MAX)
 #endif
 
-#endif //ifndef _ISSMTYPEDEFS_H_
+#endif /*_INTEL_WIN_*/
+
+#endif /*_ISSM_CONSTANTS_H_*/