Changeset 27484 for trunk

Timestamp:

Mar 26, 2010, 2:40:25 PM (16 years ago)

Author:

eugene

Message:

move definition of NAN from dvo.h to ohana.h (non-C99 only)

Location:

trunk/Ohana/src

Files:

• libdvo/include/dvo.h (modified) (1 diff)
• libfits/matrix/F_get_M_value.c (modified) (1 diff)
• libohana/include/ohana.h (modified) (1 diff)

trunk/Ohana/src/libdvo/include/dvo.h

@@ -64 +64 @@
     NAN_U_INT   = 0xffffffff,
 } DVO_INT_NAN;
-
-# ifndef NAN
-# ifndef BYTE_SWAP
-#  define __nan_bytes           { 0x7f, 0xc0, 0, 0 }
-# else
-#  define __nan_bytes           { 0, 0, 0xc0, 0x7f }
-# endif
-static union { unsigned char __c[4]; float __d; } __nan_union
-    __attribute_used__ = { __nan_bytes };
-# define NAN    (__nan_union.__d)
-# endif
 
 /* RegImage.flag values */

trunk/Ohana/src/libfits/matrix/F_get_M_value.c

@@ -11 +11 @@
     return (0.0);
   pixel = matrix[0].Naxis[0]*y + x;
-  // value = NAN;
-  value = HUGE_VAL;
+  value = NAN;
 
   if (matrix[0].unsign) {

trunk/Ohana/src/libohana/include/ohana.h

@@ -94 +94 @@
 };
 
+# ifndef NAN
+# ifndef BYTE_SWAP
+#  define __nan_bytes           { 0x7f, 0xc0, 0, 0 }
+# else
+#  define __nan_bytes           { 0, 0, 0xc0, 0x7f }
+# endif
+static union { unsigned char __c[4]; float __d; } __nan_union
+    __attribute_used__ = { __nan_bytes };
+# define NAN    (__nan_union.__d)
+# endif
+
 # ifndef M_PI
 # define M_PI 3.14159265358979323846264