diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/node.c | 14 | ||||
| -rw-r--r-- | src/warnings.h | 38 |
2 files changed, 42 insertions, 10 deletions
@@ -18,6 +18,7 @@ #include "serd_internal.h" #include "string_utils.h" +#include "warnings.h" #include <assert.h> #include <float.h> @@ -28,15 +29,6 @@ #include <stdlib.h> #include <string.h> -#ifdef _WIN32 -# ifndef isnan -# define isnan(x) _isnan(x) -# endif -# ifndef isinf -# define isinf(x) (!_finite(x)) -# endif -#endif - static const size_t serd_node_align = sizeof(SerdNode); typedef struct StaticNode { @@ -527,9 +519,11 @@ serd_digits(double abs) SerdNode* serd_new_decimal(double d, unsigned frac_digits, const SerdNode* datatype) { - if (isnan(d) || isinf(d)) { + SERD_DISABLE_CONVERSION_WARNINGS + if (!isfinite(d)) { return NULL; } + SERD_RESTORE_WARNINGS const SerdNode* type = datatype ? datatype : &serd_xsd_decimal.node; const double abs_d = fabs(d); diff --git a/src/warnings.h b/src/warnings.h new file mode 100644 index 00000000..9886dc75 --- /dev/null +++ b/src/warnings.h @@ -0,0 +1,38 @@ +/* + Copyright 2019 David Robillard <http://drobilla.net> + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + +#if defined(__clang__) +#define SERD_DISABLE_CONVERSION_WARNINGS \ + _Pragma("clang diagnostic push") \ + _Pragma("clang diagnostic ignored \"-Wconversion\"") + _Pragma("clang diagnostic ignored \"-Wdouble-promotion\"") +#elif defined(__GNUC__) +#define SERD_DISABLE_CONVERSION_WARNINGS \ + _Pragma("GCC diagnostic push") \ + _Pragma("GCC diagnostic ignored \"-Wconversion\"") + _Pragma("GCC diagnostic ignored \"-Wdouble-promotion\"") +#else +#define SERD_DISABLE_CONVERSION_WARNINGS +#endif + +#if defined(__clang__) +#define SERD_RESTORE_WARNINGS _Pragma("clang diagnostic pop") +#elif defined(__GNUC__) +#define SERD_RESTORE_WARNINGS _Pragma("GCC diagnostic pop") +#else +#define SERD_RESTORE_WARNINGS +#endif + |