diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-03-23 18:23:43 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2018-03-23 18:23:43 +0100 |
| commit | 0962d1ecf116e2eeeccfa6ce5c9613407691f38c (patch) | |
| tree | 5b6b82e10117b2ca7136539f53e7c9eaa8a48867 /src | |
| parent | 445fdebcc29b909c8008ae8b4ff46c25aeba1e18 (diff) | |
| parent | 8f731933cc18515aeb20fe7224c3e4a7c02b315b (diff) | |
| download | PROJ-0962d1ecf116e2eeeccfa6ce5c9613407691f38c.tar.gz PROJ-0962d1ecf116e2eeeccfa6ce5c9613407691f38c.zip | |
Merge remote-tracking branch 'osgeo/master'
Diffstat (limited to 'src')
| -rw-r--r-- | src/pj_internal.c | 4 | ||||
| -rw-r--r-- | src/proj_internal.h | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/pj_internal.c b/src/pj_internal.c index 9cbbf20a..4da47051 100644 --- a/src/pj_internal.c +++ b/src/pj_internal.c @@ -445,6 +445,9 @@ void proj_log_func (PJ_CONTEXT *ctx, void *app_data, PJ_LOG_FUNCTION logf) { } +#if HAVE_C99_MATH +/* proj_internal.h defines pj_is_nan as isnan */ +#else /*****************************************************************************/ int pj_is_nan (double val) { /****************************************************************************** @@ -455,3 +458,4 @@ int pj_is_nan (double val) { /* cppcheck-suppress duplicateExpression */ return val != val; } +#endif diff --git a/src/proj_internal.h b/src/proj_internal.h index b3843a59..3f6ccde0 100644 --- a/src/proj_internal.h +++ b/src/proj_internal.h @@ -50,6 +50,10 @@ extern "C" { #define STATIC_ASSERT(COND) ((void)sizeof(char[(COND) ? 1 : -1])) +#if !defined(HAVE_C99_MATH) +#define HAVE_C99_MATH 0 +#endif + #ifndef PJ_TODEG #define PJ_TODEG(rad) ((rad)*180.0/M_PI) #endif @@ -130,7 +134,11 @@ void proj_fileapi_set (PJ *P, void *fileapi); const char * const *proj_get_searchpath(void); int proj_get_path_count(void); +#if HAVE_C99_MATH +#define pj_is_nan isnan +#else int pj_is_nan (double val); +#endif #ifdef __cplusplus } |