diff options
| author | schnetter <schnetter@ff385933-4943-42dc-877b-ffc776028de6> | 2004-04-10 18:31:08 +0000 |
|---|---|---|
| committer | schnetter <schnetter@ff385933-4943-42dc-877b-ffc776028de6> | 2004-04-10 18:31:08 +0000 |
| commit | 4a8fff8a0f5db85bea4a5a3b3a4b6f39b53df42c (patch) | |
| tree | 39c732d8940951bee9194478394b9a5ef8ef3d9f | |
| parent | 7f70972cd7500b24aea5e61362a5720b552f95f1 (diff) | |
Remove configuration check for isnan(), and make NaNChecker work (do
nothing) when isnan() is not there
git-svn-id: http://svn.cactuscode.org/arrangements/CactusUtils/NaNChecker/trunk@60 ff385933-4943-42dc-877b-ffc776028de6
| -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 |