Changeset 12438

Timestamp:

Mar 13, 2007, 6:06:34 PM (19 years ago)

Author:

Paul Price

Message:

Ensuring we have INFINITY and NAN. Get these from GSL if we don't.

File:

• trunk/psLib/src/sys/psType.h (modified) (2 diffs)

trunk/psLib/src/sys/psType.h

@@ -10 +10 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-03-14 00:39:51 $
+*  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-03-14 04:06:34 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -22 +22 @@
 /// @{
 
-#include <stdint.h>
+#include <inttypes.h> // According to C99, this includes stdint.h
 #include <float.h>
 #include <stdbool.h>
+
+// Make sure we have INFINITY and NAN
+// Use GSL --- they solved the problem so we don't have to
+#ifndef INFINITY
+#include <gsl/gsl_nan.h>
+#define INFINITY GSL_POSINF
+#endif
+#ifndef NAN
+#include <gsl/gsl_nan.h>
+#define NAN GSL_NAN
+#endif
 
 /******************************************************************************/