Index: /issm/trunk-jpl/src/c/include/typedefs.h
===================================================================
--- /issm/trunk-jpl/src/c/include/typedefs.h	(revision 11444)
+++ /issm/trunk-jpl/src/c/include/typedefs.h	(revision 11445)
@@ -23,6 +23,19 @@
 /*Windows specific typefefs: */
 #ifdef _INTEL_WIN_
-#define NAN 0.0/0.0
-#define INFINITY 1.0/0.0
+
+/*Complicated way, which does not handle INFINITY though: */
+/*#ifndef NAN
+	static const unsigned long __nan[2] = {0xffffffff, 0x7fffffff};
+	#define NAN (*(const float *) __nan)
+#endif*/
+
+//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