Commit Graph

  • *
  • | *
  • | *
  • | *
  • * |
  • * |
  • * |
  • * |
  • * |
  • | *
  • | |\
  • * | |
  • | | *
  • | |/
  • * |
  • * |
  • * |
  • * |
  • | | *
  • | |/
  • |/|
  • | | *
  • | |/|
  • |/| |
  • * | |
  • |\ \ \
  • | * | |
  • |/ / /
  • * | |
  • |\ \ \
  • * | | |
  • * | | |
  • | * | |
  • | * | |
  • |/ / /
  • | | | *
  • | |_|/|
  • |/| | |
  • * | | |
  • * | | |
  • * | | |
  • * | | |
  • |\ \ \ \
  • | * | | |
  • | * | | |
  • | * | | |
  • | * | | |
  • | |\ \ \ \
  • | |/ / / /
  • |/| | | |
  • * | | | |
  • * | | | |
  • * | | | |
  • * | | | |
  • * | | | |
  • * | | | |
  • |\ \ \ \ \
  • | | | | * \
  • | | | | |\ \
  • | |_|_|_|/ /
  • |/| | | | |
  • | | | | | *
  • | | | | | |\
  • | |_|_|_|_|/
  • |/| | | | |
  • * | | | | |
  • * | | | | |
  • | | * | | |
  • | | |\ \ \ \
  • | |_|/ / / /
  • |/| | | | |
  • * | | | | |
  • | | | | | | *
  • | |_|_|_|_|/|
  • |/| | | | |/
  • | | | | |/|
  • | | | |/| |
  • | | |/| | |
  • | | * | | |
  • * | | | | |
  • |\ \ \ \ \ \
  • * \ \ \ \ \ \
  • |\ \ \ \ \ \ \
  • * \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \
  • | |_|_|_|/ / / /
  • |/| | | | | | |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | | *
  • | | | | | | | *
  • | | | | | | | *
  • | | | | | | | |\
  • | |_|_|_|_|_|_|/
  • |/| | | | | | |
  • | | | | | | | *
  • | | | | | | | *
  • | | | | | | | *
  • | | | * | | | |
  • | |_|/ / / / /
  • |/| | | | | |
  • | | * | | | |
  • | | * | | | |
  • | |/ / / / /
  • |/| | | | |
  • | * | | | |
  • | * | | | |
  • |/ / / / /
  • * | | | |
  • * | | | |
  • * | | | |
  • |\ \ \ \ \
  • | |_|_|_|/
  • |/| | | |
  • | | | | *
  • | | | | *
  • | * | | |
  • | * | | |
  • |/ / / /
  • * | | |
  • * | | |
  • * | | |
  • * | | |
  • |\ \ \ \
  • | * | | |
  • | * | | |
  • | * | | |
  • | * | | |
  • | * | | |
  • | * | | |
  • | * | | |
  • |/ / / /
  • * | | |
  • |\ \ \ \
  • | * | | |
  • * | | | |
  • * | | | |
  • * | | | |
  • * | | | |
  • * | | | |
  • * | | | |
  • * | | | |
  • |/ / / /
  • | | | | *
  • | |_|_|/|
  • |/| | | |
  • * | | | |
  • * | | | |
  • * | | | |
  • * | | | |
  • |\ \ \ \ \
  • * \ \ \ \ \
  • |\ \ \ \ \ \
  • * \ \ \ \ \ \
  • |\ \ \ \ \ \ \
  • * \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \
  • 5641227 strerror_override: re-organize strerror_override.h by Alexandru Ardelean 2017-11-07 16:21:52 +0200
  • 83c29cf (refs/pull/372/head) Fixed #371: -Infinity correctly parsed after other Infinity by Jlguardi 2017-11-03 09:55:39 +0100
  • 431bd0c Improved testing for Infinity by Jlguardi 2017-11-03 09:51:16 +0100
  • 239c849 Fixed testReplaceExisting compilation error by Jlguardi 2017-11-03 09:32:33 +0100
  • fabb84a Remove out of date win32 build information, and mention the need to use cmake there. by Eric Haszlakiewicz 2017-10-22 22:46:05 -0400
  • e424af3 Fix definition of NELEM in the tests. by Eric Haszlakiewicz 2017-10-22 22:28:35 -0400
  • ac09581 Issue #370: work around Clang-on-windows oddities by rearranging ifdefs. by Eric Haszlakiewicz 2017-10-22 22:19:41 -0400
  • c9c84ca Issue #369: note some useful settings when building for Android. by Eric Haszlakiewicz 2017-10-19 23:30:51 -0400
  • cf91362 Use cmake to create the json-c.pc file, as suggested by PR#362. by Eric Haszlakiewicz 2017-10-09 13:16:00 -0400
  • ddc97b2 Merge pull request #365 from mbehr1/json-c-0.12 by Eric Haszlakiewicz 2017-10-04 18:19:40 -0400
  • 579f074 Issue #173, follow up to using strtoll to allow this to work on older Windows environments: Use cmake to generate config.h from config.h.win32, including checking for strtoll with cmake, or fall back to _strtoi64 for older MSVC's. Also, add a few missing files to the list of sources to build. by Eric Haszlakiewicz 2017-10-03 22:50:29 -0400
  • ec8912b (refs/pull/365/head) added fallthrough for gcc7 by Matthias Behr 2017-10-03 09:26:59 +0200
  • cfbdf77 The new cmake-generated VS builds now generate a dynamic .dll instead of a .lib by Eric Haszlakiewicz 2017-09-17 21:44:04 -0400
  • 139eb64 For appveyor builds, json_config.h is actually generated in the "include" directory. by Eric Haszlakiewicz 2017-09-17 21:35:53 -0400
  • 66a77d1 Split the list of cmake headers into public and private ones, and only install the public ones. by Eric Haszlakiewicz 2017-09-17 21:27:07 -0400
  • 8899f3f Add a "cmake ." line to the appveyor build file to try to get it working again. by Eric Haszlakiewicz 2017-09-17 21:25:49 -0400
  • 1110e84 (refs/pull/363/head) Add json_object_add_int functions by Juraj Vijtiuk 2017-09-14 08:05:33 -0400
  • 2ceda3f (refs/pull/362/merge) Merge 1dbf999383 into dc79d94c38 by Joel Winarske 2017-09-13 03:08:16 +0000
  • dc79d94 Merge pull request #361 from schwehr/int64 by Eric Haszlakiewicz 2017-09-11 21:25:27 -0400
  • d9879c2 (refs/pull/361/head) Fix double to int cast overflow in json_object_get_int64. by Kurt Schwehr 2017-09-11 07:23:00 -0700
  • 5454c4e Merge pull request #360 from jasonbking/master by Eric Haszlakiewicz 2017-09-07 22:45:48 -0400
  • 4ac47a0 Issue#353: attempt to fix or ignore a few -Wdocumentation messages from Clang. by Eric Haszlakiewicz 2017-09-07 22:22:25 -0400
  • edde8ef Issue#353: mark lh_abort as actually deprecated, not just in the docs. by Eric Haszlakiewicz 2017-09-07 22:21:29 -0400
  • e3fabe9 (refs/pull/360/head) Add long long 64-bit check by Jason King 2017-09-08 01:46:06 +0000
  • 5355d38 Use strtoll to parse ints by Jason King 2017-09-07 17:21:14 +0000
  • 73717b8 (refs/pull/354/merge) Merge 3e5ad38a83 into e1561ed1df by Maarten Billemont 2017-09-07 09:19:32 +0000
  • e1561ed Remove the Visual Studio project files as they were out of date, and should now be generated by using cmake. by Eric Haszlakiewicz 2017-09-06 23:50:03 -0400
  • 7e608c5 Issue #359: Use consistent spacing in CMakeLists.txt by Eric Haszlakiewicz 2017-09-06 23:40:20 -0400
  • 32f503f Issue #359: Don't duplicate lh_get_hash, just omit the "inline" for VS2010. by Eric Haszlakiewicz 2017-09-06 23:39:23 -0400
  • d58693b Merge pull request #359 from Haffon/api-0.12 by Eric Haszlakiewicz 2017-09-06 23:20:36 -0400
  • 837a249 (refs/pull/359/head) set JSON_C_HEADERS full file name by Haffon 2017-09-07 10:39:14 +0800
  • e9f9f14 if compile with vs2015, enable the "static inline" declare. by Haffon 2017-09-07 10:28:26 +0800
  • b301f4e rollback api to 0.12 by Haffon 2017-09-07 10:02:21 +0800
  • 86a3a64 Merge pull request #2 from json-c/master by Haffon 2017-09-07 09:33:07 +0800
  • 548d000 Undo a bit of 2d1da5ab: handle per-thread formats for double serialization, even if --enable-threading wasn't specified. by Eric Haszlakiewicz 2017-09-05 01:56:42 -0400
  • b2afca4 Issue #173: since some sscanf implementations return 0 for non-zero inputs, directly check for "0" in the input. by Eric Haszlakiewicz 2017-09-05 01:53:13 -0400
  • 2d1da5a Add a --enable-threading configure option, and only use the (slower) __sync_add_and_fetch()/__sync_sub_and_fetch() function when it is specified. by Eric Haszlakiewicz 2017-09-03 23:37:12 -0400
  • 8777c94 Use AC_CONFIG_MACRO_DIRS to specify path to the ax macros instead of passing -I to autoreconf in autogen.sh. by Eric Haszlakiewicz 2017-09-03 22:35:58 -0400
  • 5b11e9a Explicitly check for GCC's atomic functions instead of depending on the __GNUC__ define. Add a comment mentioning the limitation even though the _ref_count value is hanled atomically. by Eric Haszlakiewicz 2017-09-02 14:48:17 -0400
  • ab0d4db Merge branch 'pull-211' This is EmielBruijntes' "Atomic updates for the refcount" by Eric Haszlakiewicz 2017-09-02 13:54:15 -0400
  • 1dbf999 (refs/pull/362/head) merge upstream/master by Joel Winarske 2017-09-02 09:58:08 -0700
  • 3e5ad38 (refs/pull/354/head) Merge remote-tracking branch 'upstream/master' by Maarten Billemont 2017-09-01 15:36:51 -0400
  • 95dff31 Issue #351: don't redefine SIZE_T_MAX if it's already defined. by Eric Haszlakiewicz 2017-08-30 23:35:56 -0400
  • 447d67d Issue #349: none of automake's clean targets are suite for really cleaning up everything, so add a local "really-clean" target that does so. by Eric Haszlakiewicz 2017-08-30 23:17:24 -0400
  • 95e174e Merge pull request #1 from json-c/master by Haffon 2017-08-30 00:02:59 +0800
  • 81f6edb PR#331: for Visual Studio, use a snprintf/vsnprintf wrapper that ensures the string is terminated. by Eric Haszlakiewicz 2017-08-25 01:15:39 -0400
  • cf2da01 (refs/pull/355/merge) Merge 3141c3976b into 256ebcd827 by Haffon 2017-08-22 06:03:25 +0000
  • 3141c39 (refs/pull/355/head) 1.make it can been compiled with Visual Studio 2010 2.replace json_object_get/put API with json_object_retain/release, as they operate the reference counter, and confused with array_list_get/put_idx. 3.replace array_list_get/put_idx API with array_list_get/insert to make them more clear to use. by Haffon 2017-08-22 13:53:47 +0800
  • 256ebcd Merge pull request #346 from schwehr/get_int by Eric Haszlakiewicz 2017-08-21 20:50:58 -0500
  • 474376f Merge pull request #345 from MrAnno/fix-make-dist by Eric Haszlakiewicz 2017-08-21 20:50:20 -0500
  • 2f1fe55 Merge pull request #344 from fastogt/master by Eric Haszlakiewicz 2017-08-21 20:39:11 -0500
  • 4be13fc pkgconfig package rename by Joel Winarske 2017-08-14 12:41:13 -0700
  • 3fee410 pkg_config and _GNU_SOURCE only for Linux by Joel Winarske 2017-08-14 11:00:12 -0700
  • f554039 Custom platform build output paths. by Maarten Billemont 2017-08-13 16:09:35 -0400
  • 105891a Ignore INSTALL by Maarten Billemont 2017-08-13 11:36:21 -0400
  • ac00e62 Merge branch 'master' of github.com:lhunath/json-c by Maarten Billemont 2017-08-13 00:24:27 -0400
  • c820d6a INSTALL is an autotools script, rename this file. by Maarten Billemont 2017-08-13 00:24:13 -0400
  • 13ce1ba Fix build for platforms that define SIZE_T_MAX. by Maarten Billemont 2017-08-13 00:23:21 -0400
  • 5977ef6 Fix documentation issues, -Wdocumentation. by Maarten Billemont 2017-08-13 00:22:59 -0400
  • ef7b08c (refs/pull/346/head) Clamp double to int32 when narrowing in json_object_get_int. by Kurt Schwehr 2017-08-08 07:54:38 -0700
  • e0e34f0 (refs/pull/345/head) Fix 'make distcheck' by László Várady 2017-08-04 12:26:54 +0200
  • db8dbbf Fix 'make dist' by László Várady 2017-08-04 11:59:14 +0200
  • 0a99e7a (refs/pull/344/head) Fix Mingw build by topilski 2017-07-30 07:37:17 +0300
  • 65884f4 Fix parsing doubles for mingw by topilski 2017-07-30 07:30:05 +0300
  • af87944 PR #336: fix to previous change, be sure to include string.h when we're using the real strerror. by Eric Haszlakiewicz 2017-07-27 20:17:25 -0700
  • 36dbe2d PR #336: Fix typo in defining STRERROR_OVERRIDE_IMPL by Eric Haszlakiewicz 2017-07-27 20:10:53 -0700
  • 8d8a785 Merge pull request #340 from commodo/fix-appveyor-build by Eric Haszlakiewicz 2017-07-27 23:09:12 -0400
  • 59458dd don't use locale functions, android ndk 15... by Joel Winarske 2017-07-21 12:56:55 -0700
  • aec0c80 for building with Clang and Android by Joel Winarske 2017-07-21 12:19:57 -0700
  • d8fbfc7 (refs/pull/340/head) build,travis: drop `-enable-strerror-override` argument (no longer exists) by Alexandru Ardelean 2017-07-19 15:22:36 +0300
  • ddce7c2 strerror_override: add extern "C" and JSON_EXPORT specifiers for Visual C++ compilers by Alexandru Ardelean 2017-07-19 15:10:10 +0300
  • fcad0ec PR #336: since we can't use function overriding (due to problems with it on OSX) always include the _json_c_strerror function but only enable it with a flag during tests. by Eric Haszlakiewicz 2017-07-15 07:12:44 -0700
  • 730ab7b PR #336: since we can't use function overriding (due to problems with it on OSX) always include the _json_c_strerror function but only enable it with a flag during tests. by Eric Haszlakiewicz 2017-07-15 07:07:28 -0700
  • 40317f0 Allow USE_VALGRIND to be set to anything starting with 0, N or n to disable valgrind during tests. by Eric Haszlakiewicz 2017-07-15 07:03:18 -0700
  • c0b7d76 Merge pull request #336 from commodo/fix-tests by Eric Haszlakiewicz 2017-07-13 22:39:01 -0400
  • bc2e304 (refs/pull/336/head) build,travis: enable strerror override option in build by Alexandru Ardelean 2017-07-13 10:24:27 +0300
  • fb72160 build: make `strerror()` override-able by Alexandru Ardelean 2017-07-13 10:11:15 +0300
  • 85f5785 configure.ac: check for `uselocale` function only on Linux platforms by Alexandru Ardelean 2017-07-13 09:33:39 +0300
  • 7b9432d tests: fix leak in `test_util_file` ; found by cppcheck by Alexandru Ardelean 2017-07-10 18:00:41 +0300
  • effab3f travis,tests: run cppcheck only if it exists by Alexandru Ardelean 2017-07-10 17:47:00 +0300
  • 9d47ae8 tests: compress test_utile_file with test_basic by Alexandru Ardelean 2017-07-10 13:30:49 +0300
  • ba8625a tests: add `set -e` specifier to bail early on build run by Alexandru Ardelean 2017-07-10 12:01:56 +0300
  • dd8dcb8 Merge pull request #335 from commodo/build_status_travis by Eric Haszlakiewicz 2017-07-11 00:16:12 -0400
  • 061afc7 (refs/pull/335/head) README.md: show build status tag from travis & appveyor. by Alexandru Ardelean 2017-07-10 11:28:10 +0300
  • b64402e Move a variable declaration to the start of the block to work better with older compilers. by Eric Haszlakiewicz 2017-07-09 16:08:29 -0700
  • a14ada5 Remove a spurious comma in configure.ac by Eric Haszlakiewicz 2017-07-09 16:00:32 -0700
  • 33db761 Updated expected test1 output which should have been included in commit fd9b3b2. by Eric Haszlakiewicz 2017-07-09 15:22:53 -0700
  • 1d3e97f Comment out the warning about racy random seed initialization in lh_char_hash(), if you're on a platform where it'll be triggered it just makes it a pain to build. by Eric Haszlakiewicz 2017-07-09 15:13:02 -0700
  • f7a44ad Add extra casts to void * to squash some warning on certain systems (e.g. CentOS w/ gcc 4.1.2). by Eric Haszlakiewicz 2017-07-09 15:08:21 -0700
  • 7b7a76e Fix bad usage of strncat introduces in 1a94c70. Pointed out by @rouault in PR #331. by Eric Haszlakiewicz 2017-07-09 15:04:18 -0700
  • 55ecae3 Eliminate static qualifiers on a couple local variables that were causing thread safety issues. Suggested by @rouault in PR #331. by Eric Haszlakiewicz 2017-07-09 14:56:18 -0700
  • 4787d74 (refs/pull/331/merge) Merge 7da4123fae into 5a99e527ff by Even Rouault 2017-07-09 03:33:48 +0000
  • 5a99e52 Reformat json_object_double_to_json_string_format() to have consistent spacing. by Eric Haszlakiewicz 2017-07-08 20:33:28 -0700
  • 5e33dab Issue #308: improve the build instructions in README.md to include the exact commands to run for installing prerequisites, as mentioned earlier on Issue #308. by Eric Haszlakiewicz 2017-07-08 19:35:06 -0700
  • fd9b3b2 Issue #332: fix a long-standing bug in array_list_put_idx() where it would attempt to free previously free'd entries due to not checking the current array length. Add a test that triggers the problem to ensure it stays fixed. by Eric Haszlakiewicz 2017-07-08 19:04:35 -0700
  • 7fd74fc Merge pull request #312 from Tailmon/master by Eric Haszlakiewicz 2017-07-08 21:25:48 -0400
  • 4deed58 Merge pull request #319 from Dashlane/visual-studio-build by Eric Haszlakiewicz 2017-07-08 21:24:55 -0400
  • a3f97ee Merge pull request #329 from commodo/rename-static-lib by Eric Haszlakiewicz 2017-07-08 15:44:27 -0400
  • db3115c Merge pull request #330 from commodo/symlink_some_tests by Eric Haszlakiewicz 2017-07-08 15:43:45 -0400
  • cc201fd Merge pull request #333 from besser82/bugfix/obsolete_macros_autotools by Eric Haszlakiewicz 2017-07-08 15:17:17 -0400