Commit Graph

  • 93582ad85e Link against libm when needed Thomas Petazzoni 2015-05-01 12:52:18 +02:00
  • 36b0169ed6 Enable silent build by default Yegor Yefremov 2015-04-25 21:57:38 +02:00
  • cdca9d3c8e Added array_list_del_idx and json_object_array_del_idx Mark Swoope 2015-04-02 14:05:27 -07:00
  • 89ae583a86 Fix uninitialised variable compile warning, and also fix unused-when-used warning Stuart Walsh 2015-03-31 12:23:03 +01:00
  • 736f4b3581 Build random_seed.c as well James Myatt 2015-02-05 16:38:47 +00:00
  • 9d3d8d6fc0 Add x64 build configurations James Myatt 2015-02-05 16:15:06 +00:00
  • e1a3f33a26 Set CompileAsCpp flag (Required for vs2010/winsdk71) Revert some project settings to defaults James Myatt 2015-02-05 16:12:28 +00:00
  • d5baa0381f Update VS project to include current source files James Myatt 2015-02-05 16:02:58 +00:00
  • 18b3c49296 Use more appropriate casts James Myatt 2015-02-05 15:59:19 +00:00
  • bf32650c83 Add missing include file to random_seed James Myatt 2015-02-05 15:58:39 +00:00
  • 720d566d03 Define macros from inttypes.h when not available James Myatt 2015-02-05 15:58:12 +00:00
  • 9be71700eb json_tokener requires INF and NAN James Myatt 2015-02-05 15:57:14 +00:00
  • 72310c87a5 Define INFINITY and NAN when missing James Myatt 2015-02-05 15:56:49 +00:00
  • 0137103f4b Include config.h in linkhash so that HAVE_ENDIAN_H is defined (if available) James Myatt 2015-02-05 15:55:25 +00:00
  • a74f6b2867 Updated config for vs2010/winsdk71 as well as vs2013 Define JSON_C_HAVE_INTTYPES_H in json_config.h.win32 only James Myatt 2015-02-05 15:54:19 +00:00
  • 68d856f618 Merge pull request #168 from bugness-chl/master Eric Haszlakiewicz 2015-03-03 22:41:31 -05:00
  • 7e3a6c6b9d Merge pull request #163 from sixlettervariables/fix-win32-build-problems Eric Haszlakiewicz 2015-03-03 22:35:36 -05:00
  • da62fca305 Merge pull request #144 from mhei/master Eric Haszlakiewicz 2015-03-03 22:12:49 -05:00
  • 484ca368f0 Slight style tweaks to the bsearch changest. Eric Haszlakiewicz 2015-03-04 03:10:10 +00:00
  • a500c1f0b5 Merge pull request #155 from LeSpocky/bsearch Eric Haszlakiewicz 2015-03-03 22:00:08 -05:00
  • 9db3099572 Merge pull request #156 from jubalh/master Eric Haszlakiewicz 2015-03-03 21:37:02 -05:00
  • 99d8fc975e Tightening the number parsing algorithm chl 2015-02-05 01:34:10 +01:00
  • 4d18d39d99 Adds json_config.h.win32 to project. Adds VS2k13 project. Christopher Watford 2014-12-05 10:27:44 -05:00
  • 0609a5729c Fixes #160 'missing header file on windows' Christopher Watford 2014-12-05 10:22:36 -05:00
  • ec4879ac5b Merge pull request #153 from LeSpocky/doc Eric Haszlakiewicz 2014-09-13 22:18:51 -04:00
  • 6ec6fdaf8c Merge pull request #151 from mjchinn/json_type-comma Eric Haszlakiewicz 2014-09-13 22:18:14 -04:00
  • 2c722277ee Merge pull request #150 from ams-cs/master Eric Haszlakiewicz 2014-09-13 22:17:57 -04:00
  • f88db708ac Merge pull request #141 from AlexandruCostache/master Eric Haszlakiewicz 2014-09-13 22:14:44 -04:00
  • fcf5ad1bd6 Remove trailing whitespace Michael Vetter 2014-08-26 14:48:59 +02:00
  • 2f5789bdef add bsearch for arrays Alexander Dahl 2014-08-21 15:42:50 +02:00
  • 37f5d8696d improve doc for json_object_to_json_string() Alexander Dahl 2014-08-18 10:28:38 +02:00
  • 048dcf288a Remove json_type enum trailing comma Michael J. Chinn 2014-08-10 00:46:25 -04:00
  • ca0ebe0f71 Fix build using MinGW. Andrew Stubbs 2014-08-04 11:44:25 +01:00
  • db833f2411 SONAME bump Christopher Meng 2014-07-28 19:28:19 +08:00
  • a7534dbb7e Introduce json_object_from_fd Michael Heimpold 2014-07-21 23:15:45 +02:00
  • 4841c48f81 Removed duplicate check in random_seed test - bug #140 Alexandru Costache 2014-07-04 11:58:14 +03:00
  • d4e81f9ec8 Move the json_min() and json_max() macros to json_util.h and mark everything else in bits.h deprecated. Eliminate all uses of bits.h within the json-c code. Eric Haszlakiewicz 2014-05-03 22:29:10 -04:00
  • 1da0599e0e Fix the definition of the error_description() macro in bits.h now that json_tokener_errors[] is not exported. Eric Haszlakiewicz 2014-05-03 22:26:26 -04:00
  • 3859e99f50 Remove unused variable 'size' Petar Koretić 2014-04-11 10:03:40 +02:00
  • 2149a04ca8 Check for failures when allocating memory; return NULL and set errno=ENOMEM in a few of those cases. Thanks to Susant Sahani for pointing out some of these. Eric Haszlakiewicz 2014-04-19 20:33:05 -04:00
  • 92a7740e90 Reformat some code in json_object.c Eric Haszlakiewicz 2014-04-19 20:23:54 -04:00
  • 795e9151a1 Add an empty README file to placate autoconf. Eric Haszlakiewicz 2014-04-19 20:22:44 -04:00
  • 4569e3e430 Fix minor typo in README file. Eric Haszlakiewicz 2014-04-19 20:11:05 -04:00
  • 40aab4c502 Merge pull request #133 from haneefmubarak/patch-1 Eric Haszlakiewicz 2014-04-19 20:10:10 -04:00
  • 332a594fd4 Merge pull request #132 from pkoretic/master Eric Haszlakiewicz 2014-04-19 20:05:06 -04:00
  • 7870978c2e Update README.md Haneef Mubarak 2014-04-12 00:40:05 -07:00
  • 23620b827c Update and rename README to README.md Haneef Mubarak 2014-04-12 00:36:08 -07:00
  • fa54bd542e Update the release checklist to include calculating the tarball checksums and updating the wiki. Eric Haszlakiewicz 2014-04-11 20:06:27 -04:00
  • cbf2def5e7 Remove extra <ul>. Eric Haszlakiewicz 2014-04-11 19:51:46 -04:00
  • 98ba5e8b41 Update the index page to point at the 0.12 release. Eric Haszlakiewicz 2014-04-11 19:46:42 -04:00
  • eeaa64d9a6 Add the 0.12 release docs to gh-pages. Eric Haszlakiewicz 2014-04-11 19:44:06 -04:00
  • 259c5c0b5f Remove unused variable 'size' Petar Koretić 2014-04-11 10:03:40 +02:00
  • 515ba0dfb7 Bump versions up to 0.12.99 since a 0.12 release was just created. Eric Haszlakiewicz 2014-04-10 22:44:13 -04:00
  • 5ec26015b8 Add doxygen-generated docs for the 0.12 release. json-c-0.12-20140410 Eric Haszlakiewicz 2014-04-10 22:35:45 -04:00
  • 3c94cdd1af Bump the version numbers for the 0.12 release. Eric Haszlakiewicz 2014-04-10 22:03:03 -04:00
  • b623741e3d Add automake/autoconf generated files for the 0.12 release. Eric Haszlakiewicz 2014-04-10 22:02:36 -04:00
  • f84d9c55db Update the ChangeLog with the changes for the 0.12 release. Bump the version in the release checklist. Eric Haszlakiewicz 2014-04-10 21:07:20 -04:00
  • 64e36901a0 Patch to address the following issues: Michael Clark 2014-04-09 13:48:21 +08:00
  • 784534a31f Eliminate the deprecated mc_abort() function and MC_ABORT macro. Eric Haszlakiewicz 2014-03-22 21:48:34 -04:00
  • f9136f6852 Make the json_tokener_errors array local. It has been deprecated for a while, and json_tokener_error_desc() should be used instead. Eric Haszlakiewicz 2014-03-22 21:41:24 -04:00
  • 936d036ea3 Simplify the tests Makefile to avoid repeating the name of each test. Eric Haszlakiewicz 2014-03-22 21:40:37 -04:00
  • e2bbb5664c Rename the "test_case" test to "test_charcase" to make it slightly less confusing. Eric Haszlakiewicz 2014-03-22 21:15:41 -04:00
  • 9f26d96f09 Fix warnings from autoconf about "...no AC_LANG_SOURCE call detected..." by adding that call within the AC_LINK_IFELSE call. Eric Haszlakiewicz 2014-03-22 19:15:01 -04:00
  • 05da316b9c Issue #103: allow Infinity and -Infinity to be parsed. Eric Haszlakiewicz 2014-03-22 17:28:40 -04:00
  • 217bc29352 Merge pull request #123 from fingon/use-NAN-if-available Eric Haszlakiewicz 2014-03-22 13:39:36 -04:00
  • a1c8991e13 nan function requires -lm on some platforms; use of NAN is better, if available. Markus Stenberg 2014-03-18 16:29:49 +02:00
  • 0eedf3802f Issue#102 - add support for parsing "NaN". Eric Haszlakiewicz 2014-03-09 16:41:33 -04:00
  • e6f1322b5e Issue#114: check for the presence of isnan and isinf, and provide compat macros on MSCV where _isnan and _finite exist instead. Eric Haszlakiewicz 2014-03-02 12:16:37 -05:00
  • db117ca02b Merge pull request #121 from TazeTSchnitzel/LowercaseLiterals Eric Haszlakiewicz 2014-02-12 13:37:17 -05:00
  • cf23e7506e Merge branch 'master' into LowercaseLiterals Andrea Faulds 2014-02-12 09:52:25 +00:00
  • 1d6f9140ba Missing tests Andrea Faulds 2014-02-12 09:51:51 +00:00
  • 4c086dfff7 Merge commit '89535bb' Eric Haszlakiewicz 2014-02-11 23:57:24 -05:00
  • 020fa65724 Merge pull request #112 from TazeTSchnitzel/LowercaseLiterals Eric Haszlakiewicz 2014-02-11 23:21:50 -05:00
  • 56df93d128 Fix Issue #111: Fix off-by-one error when range checking the input to json_tokener_error_desc(). Eric Haszlakiewicz 2014-02-11 23:16:53 -05:00
  • ceeaf42bc8 Merge pull request #109 from kdopen/use_strtod Eric Haszlakiewicz 2014-02-11 23:13:19 -05:00
  • b821f0e10f Merge branch 'ebassi-master' Eric Haszlakiewicz 2014-02-11 23:06:19 -05:00
  • c8e0497d47 Merge branch 'master' of https://github.com/ebassi/json-c into ebassi-master Eric Haszlakiewicz 2014-02-11 23:05:54 -05:00
  • 295bea21d0 Ignore and cleanup a few more files that automake creates. Eric Haszlakiewicz 2014-02-11 23:03:46 -05:00
  • a2c078fc6e Issue#105: Rename configure.in to configure.ac Eric Haszlakiewicz 2014-02-11 22:55:52 -05:00
  • c8ee919642 Remove the old libjson.so name compatibility support. The library is only created as libjson-c.so now and headers are only installed into the ${prefix}/json-c directory. Eric Haszlakiewicz 2014-02-11 22:49:59 -05:00
  • 89535bb1ff build: call AM_PROG_CC_C_O as requested by autoreconf Ross Burton 2013-11-18 16:25:14 +00:00
  • bda0540cb9 Only allow lowercase literals in STRICT mode Andrea Faulds 2013-11-14 21:13:32 +00:00
  • c51b88d69a Avoid potential overflow in json_object_get_double Keith Derrick 2013-10-01 09:18:51 -07:00
  • 311686f63e Add a check for the -Bsymbolic-functions linker flag Emmanuele Bassi 2013-09-17 13:08:14 +01:00
  • 06450206c4 Issue #59: change the floating point output format to %.17g so values with more than 6 digits show up in the output. Eric Haszlakiewicz 2013-09-11 21:09:43 -05:00
  • a23caf677c Use sizeof instead of hard coded values when calling snprintf. Eric Haszlakiewicz 2013-09-11 20:28:56 -05:00
  • 51993c28c2 Added a json_object_new_double_s() convenience function to allow an exact string representation of a double to be specified when creating the object and use it in json_tokener_parse_ex() so a re-serialized object more exactly matches the input. Add json_object_free_userdata() and json_object_userdata_to_json_string() too. Eric Haszlakiewicz 2013-09-11 20:27:39 -05:00
  • b83e0f1182 Ignore the test-driver script that is now created, and the script for the test_locale test. Eric Haszlakiewicz 2013-09-08 17:30:54 -05:00
  • 60e4990d1d The updated test driver creates .log and .trs files; ignore them. Eric Haszlakiewicz 2013-09-08 17:23:24 -05:00
  • 8d18815f8a strndup is gone, remove it from the README file. Eric Haszlakiewicz 2013-09-08 17:21:52 -05:00
  • b939bd3768 Merge pull request #97 from pascal-bach/master Eric Haszlakiewicz 2013-09-08 13:36:40 -07:00
  • ef43fe3571 Merge pull request #96 from rouault/remove_strdnup Eric Haszlakiewicz 2013-09-08 13:35:28 -07:00
  • a030120c55 Merge pull request #95 from rouault/extern_json_object_set_serializer Eric Haszlakiewicz 2013-09-08 13:33:22 -07:00
  • 02aa6f01f4 Merge pull request #94 from remicollet/issue-strict2 Eric Haszlakiewicz 2013-09-08 13:29:05 -07:00
  • 8356ecc16b Merge pull request #93 from tmielika/master Eric Haszlakiewicz 2013-09-08 13:26:56 -07:00
  • bd42b8310d Merge pull request #104 from rouault/fix_json_tokener_error_desc_out_of_bounds_read Eric Haszlakiewicz 2013-09-08 13:20:08 -07:00
  • 86dd55a74a Fix potential out-of-bounds read in json_tokener_error_desc Even Rouault 2013-09-08 11:31:38 +02:00
  • 4039f91cab trailing char not allowed in strict mode Remi Collet 2013-08-23 13:40:01 +02:00
  • 87fa32dfe0 no comment in strict mode Remi Collet 2013-08-21 15:41:40 +02:00
  • 20e4708c8a Update json_util Pascal Bach 2013-08-13 18:24:23 +02:00