Mercurial > hg > qm-dsp

changeset 317:f51af910550f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Sort out this isnan/isinf nonsense once and for all
author Chris Cannam <c.cannam@qmul.ac.uk>
date Wed, 09 Feb 2011 15:25:36 +0000
parents cc93789cbc56
children 5b4f65438b01
files maths/nan-inf.h
diffstat 1 files changed, 7 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/maths/nan-inf.h	Wed Feb 09 11:47:20 2011 +0000
+++ b/maths/nan-inf.h	Wed Feb 09 15:25:36 2011 +0000
@@ -2,19 +2,12 @@
 #ifndef NAN_INF_H
 #define NAN_INF_H
 
-#include <math.h>
-
-#ifdef sun
-
-#include <ieeefp.h>
-#define ISNAN(x) ((sizeof(x)==sizeof(float))?isnanf(x):isnand(x))
-#define ISINF(x) (!finite(x))
-
-#else
-
-#define ISNAN(x) isnan(x)
-#define ISINF(x) isinf(x)
+#define ISNAN(x) (sizeof(x) == sizeof(double) ? ISNANd(x) : ISNANf(x))
+static inline int ISNANf(float x) { return x != x; }
+static inline int ISNANd(double x) { return x != x; }
+          
+#define ISINF(x) (sizeof(x) == sizeof(double) ? ISINFd(x) : ISINFf(x))
+static inline int ISINFf(float x) { return !ISNANf(x) && ISNANf(x - x); }
+static inline int ISINFd(double x) { return !ISNANd(x) && ISNANd(x - x); }
 
 #endif
-
-#endif