diff options
| author | John Crispin <blogic@openwrt.org> | 2015-03-11 15:54:33 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-03-11 15:54:33 +0000 |
| commit | 93cd017604893d240662fb63d14a8de45b189936 (patch) | |
| tree | f09257494288aec77498d56fda5f33204b6f0287 /package/libs/libjson-c/patches | |
| parent | 8d41dec38a3e45949bab92590f0eb72f2384d10e (diff) | |
| download | upstream-93cd017604893d240662fb63d14a8de45b189936.tar.gz upstream-93cd017604893d240662fb63d14a8de45b189936.tar.bz2 upstream-93cd017604893d240662fb63d14a8de45b189936.zip | |
json-c: update to 0.12 and bump all depending services
Version 0.12 deprecates json_object_object_get and moves the header files around
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44657 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libs/libjson-c/patches')
| -rw-r--r-- | package/libs/libjson-c/patches/000-libm.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/package/libs/libjson-c/patches/000-libm.patch b/package/libs/libjson-c/patches/000-libm.patch new file mode 100644 index 0000000000..45adb0597f --- /dev/null +++ b/package/libs/libjson-c/patches/000-libm.patch @@ -0,0 +1,50 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -43,12 +43,6 @@ + AC_FUNC_MALLOC + AC_FUNC_REALLOC + AC_CHECK_FUNCS(strcasecmp strdup strerror snprintf vsnprintf vasprintf open vsyslog strncasecmp setlocale) +-AC_CHECK_DECLS([INFINITY], [], [], [[#include <math.h>]]) +-AC_CHECK_DECLS([nan], [], [], [[#include <math.h>]]) +-AC_CHECK_DECLS([isnan], [], [], [[#include <math.h>]]) +-AC_CHECK_DECLS([isinf], [], [], [[#include <math.h>]]) +-AC_CHECK_DECLS([_isnan], [], [], [[#include <float.h>]]) +-AC_CHECK_DECLS([_finite], [], [], [[#include <float.h>]]) + + #check if .section.gnu.warning accepts long strings (for __warn_references) + AC_LANG_PUSH([C]) +--- a/math_compat.h ++++ b/math_compat.h +@@ -1,28 +1,9 @@ + #ifndef __math_compat_h + #define __math_compat_h + +-/* Define isnan and isinf on Windows/MSVC */ +- +-#ifndef HAVE_DECL_ISNAN +-# ifdef HAVE_DECL__ISNAN +-#include <float.h> +-#define isnan(x) _isnan(x) +-# endif +-#endif +- +-#ifndef HAVE_DECL_ISINF +-# ifdef HAVE_DECL__FINITE +-#include <float.h> +-#define isinf(x) (!_finite(x)) +-# endif +-#endif +- +-#ifndef HAVE_DECL_NAN +-#error This platform does not have nan() +-#endif +- +-#ifndef HAVE_DECL_INFINITY +-#error This platform does not have INFINITY +-#endif ++#undef isnan ++#define isnan(x) __builtin_isnan(x) ++#undef isinf ++#define isinf(x) __builtin_isinf(x) + + #endif |