diff options
| -rw-r--r-- | src/NaNCheck.c | 16 | ||||
| -rw-r--r-- | src/make.configuration.defn | 9 |
2 files changed, 14 insertions, 11 deletions
diff --git a/src/NaNCheck.c b/src/NaNCheck.c index 57fb9b7..02f349b 100644 --- a/src/NaNCheck.c +++ b/src/NaNCheck.c @@ -574,6 +574,8 @@ static void PrintWarning (const char *error_type, @vio in @endvar @@*/ +#ifdef HAVE_ISNAN + #ifdef HAVE_FINITE #define CHECK_DATA(cctk_type) \ @@ -603,7 +605,7 @@ static void PrintWarning (const char *error_type, } \ } -#else +#else /* ! HAVE_FINITE */ #define CHECK_DATA(cctk_type) \ { \ @@ -631,7 +633,17 @@ static void PrintWarning (const char *error_type, } \ } -#endif /* HAVE_FINITE */ +#endif /* ! HAVE_FINITE */ + +#else /* ! HAVE_ISNAN */ + +/* Do nothing because isnan() is not available */ +#define CHECK_DATA(cctk_type) \ +{ \ +} + +#endif /* ! HAVE_ISNAN */ + /*@@ diff --git a/src/make.configuration.defn b/src/make.configuration.defn deleted file mode 100644 index 69801d6..0000000 --- a/src/make.configuration.defn +++ /dev/null @@ -1,9 +0,0 @@ -# make.configuration.defn for NaNChecker - -# make sure that isnan(3) is available on this architecture - -HAVE_ISNAN := $(shell grep HAVE_ISNAN $(CONFIG)/cctk_Config.h) - -ifneq (define, $(findstring define,$(HAVE_ISNAN))) - $(error "Thorn NaNChecker requires isnan(3), which is not available on this architecture. Please remove NaNChecker from your ThornList.") -endif |