mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-21 05:59:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
358 Commits 14 Branches 11 Tags
e4fce5d6aee6701be9bfc243b5fa28be3efc990a
Commit Graph

358 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Haszlakiewicz
e4fce5d6ae Merge pull request #171 from Nzbuu/vs2010_build 
Update configuration for VS2010 and win64
 2015-05-08 21:31:37 -04:00
Eric Haszlakiewicz
e1eb298de1 Merge pull request #182 from tpetazzoni/libm-fix 
Link against libm when needed
 2015-05-08 21:19:48 -04:00
Eric Haszlakiewicz
82a1316f76 Merge pull request #180 from yegorich/silent 
Enable silent build by default
 2015-05-08 21:19:05 -04:00
Thomas Petazzoni
93582ad85e Link against libm when needed 
In certain C libraries (e.g uClibc), isnan() and related functions are
implemented in libm, so json-c needs to link against it. This commit
therefore adds an AC_TRY_LINK() test to check whether a program
calling isnan() can be properly linked with no special flags. If not,
we assume linking against libm is needed.

The json-c.pc.in file is also adjusted so that in the case of static
linking against json-c, -lm is also used.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2015-05-01 13:01:17 +02:00
Yegor Yefremov
36b0169ed6 Enable silent build by default 2015-04-25 22:11:44 +02:00
James Myatt
736f4b3581 Build random_seed.c as well 2015-03-04 10:45:40 +00:00
James Myatt
9d3d8d6fc0 Add x64 build configurations 2015-03-04 10:45:40 +00:00
James Myatt
e1a3f33a26 Set CompileAsCpp flag (Required for vs2010/winsdk71) 
Revert some project settings to defaults
 2015-03-04 10:45:39 +00:00
James Myatt
d5baa0381f Update VS project to include current source files 2015-03-04 10:45:38 +00:00
James Myatt
18b3c49296 Use more appropriate casts 2015-03-04 10:45:37 +00:00
James Myatt
bf32650c83 Add missing include file to random_seed 2015-03-04 10:45:37 +00:00
James Myatt
720d566d03 Define macros from inttypes.h when not available 2015-03-04 10:45:36 +00:00
James Myatt
9be71700eb json_tokener requires INF and NAN 2015-03-04 10:45:35 +00:00
James Myatt
72310c87a5 Define INFINITY and NAN when missing 2015-03-04 10:45:34 +00:00
James Myatt
0137103f4b Include config.h in linkhash so that HAVE_ENDIAN_H is defined (if available) 2015-03-04 10:45:33 +00:00
James Myatt
a74f6b2867 Updated config for vs2010/winsdk71 as well as vs2013 
Define JSON_C_HAVE_INTTYPES_H in json_config.h.win32 only
 2015-03-04 10:45:33 +00:00
Eric Haszlakiewicz
68d856f618 Merge pull request #168 from bugness-chl/master 
Tightening the number parsing algorithm
 2015-03-03 22:41:31 -05:00
Eric Haszlakiewicz
7e3a6c6b9d Merge pull request #163 from sixlettervariables/fix-win32-build-problems 
Fix Win32 build problems
 2015-03-03 22:35:36 -05:00
Eric Haszlakiewicz
da62fca305 Merge pull request #144 from mhei/master 
Introduce json_object_from_fd
 2015-03-03 22:12:49 -05:00
Eric Haszlakiewicz
484ca368f0 Slight style tweaks to the bsearch changest. 2015-03-04 03:10:10 +00:00
Eric Haszlakiewicz
a500c1f0b5 Merge pull request #155 from LeSpocky/bsearch 
add bsearch for arrays
 2015-03-03 22:00:08 -05:00
Eric Haszlakiewicz
9db3099572 Merge pull request #156 from jubalh/master 
Remove trailing whitespaces
 2015-03-03 21:37:02 -05:00
chl
99d8fc975e Tightening the number parsing algorithm 
Some badly formated "numbers" could get partly parsed,
resulting in truncated results instead of raising an
error.

Examples :
 '1.2.3'      -> (double)1.2
 '2015-01-15' -> (int)2015

This patch is not perfect (ex: input can still end with a 'E', which
is forbidden by json.org doc) but should avoid non-sensically
formated input.

Tests added.
 2015-02-05 01:50:37 +01:00
Christopher Watford
4d18d39d99 Adds json_config.h.win32 to project. Adds VS2k13 project. 2014-12-05 10:27:44 -05:00
Christopher Watford
0609a5729c Fixes #160 'missing header file on windows' 2014-12-05 10:22:36 -05:00
Eric Haszlakiewicz
ec4879ac5b Merge pull request #153 from LeSpocky/doc 
improve doc for json_object_to_json_string()
 2014-09-13 22:18:51 -04:00
Eric Haszlakiewicz
6ec6fdaf8c Merge pull request #151 from mjchinn/json_type-comma 
Remove json_type enum trailing comma
 2014-09-13 22:18:14 -04:00
Eric Haszlakiewicz
2c722277ee Merge pull request #150 from ams-cs/master 
Fix build using MinGW.
 2014-09-13 22:17:57 -04:00
Eric Haszlakiewicz
f88db708ac Merge pull request #141 from AlexandruCostache/master 
Removed duplicate check in random_seed test - bug #140
 2014-09-13 22:14:44 -04:00
Michael Vetter
fcf5ad1bd6 Remove trailing whitespace 2014-08-26 14:48:59 +02:00
Alexander Dahl
2f5789bdef add bsearch for arrays 
Arrays can already be sorted with json_object_array_sort() which uses
qsort() of the standard C library. This adds a counterpart using the
bsearch() from C.
 2014-08-21 15:42:50 +02:00
Alexander Dahl
37f5d8696d improve doc for json_object_to_json_string() 2014-08-18 10:28:38 +02:00
Michael J. Chinn
048dcf288a Remove json_type enum trailing comma 2014-08-10 00:46:25 -04:00
Andrew Stubbs
ca0ebe0f71 Fix build using MinGW. 
MinGW requires wincrypt.h.
GCC does not support #pragma comment, which trips Werror.
 2014-08-04 11:44:25 +01:00
Michael Heimpold
a7534dbb7e Introduce json_object_from_fd 
Also refactor json_object_from_file to use json_object_from_fd
internally.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
 2014-07-21 23:15:45 +02:00
Alexandru Costache
4841c48f81 Removed duplicate check in random_seed test - bug #140 2014-07-04 12:28:35 +03:00
Eric Haszlakiewicz
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.
 2014-05-04 22:33:26 -04:00
Eric Haszlakiewicz
1da0599e0e Fix the definition of the error_description() macro in bits.h now that json_tokener_errors[] is not exported. 2014-05-03 22:26:26 -04:00
Eric Haszlakiewicz
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.
 2014-04-19 20:33:05 -04:00
Eric Haszlakiewicz
92a7740e90 Reformat some code in json_object.c 2014-04-19 20:23:54 -04:00
Eric Haszlakiewicz
795e9151a1 Add an empty README file to placate autoconf. 2014-04-19 20:22:44 -04:00
Eric Haszlakiewicz
4569e3e430 Fix minor typo in README file. 2014-04-19 20:11:05 -04:00
Eric Haszlakiewicz
40aab4c502 Merge pull request #133 from haneefmubarak/patch-1 
Update and rename README to README.md
 2014-04-19 20:10:10 -04:00
Eric Haszlakiewicz
332a594fd4 Merge pull request #132 from pkoretic/master 
Remove unused variable 'size'
 2014-04-19 20:05:06 -04:00
Haneef Mubarak
7870978c2e Update README.md 
- code blocks
 - slight text changes (rewording)
 - pretty printing
 2014-04-12 00:40:05 -07:00
Haneef Mubarak
23620b827c Update and rename README to README.md 
Markdownify + fix a few errors here and there
 2014-04-12 00:36:08 -07:00
Eric Haszlakiewicz
fa54bd542e Update the release checklist to include calculating the tarball checksums and updating the wiki. 2014-04-11 20:07:49 -04:00
Petar Koretić
259c5c0b5f Remove unused variable 'size' 2014-04-11 10:03:40 +02:00
Eric Haszlakiewicz
515ba0dfb7 Bump versions up to 0.12.99 since a 0.12 release was just created. 2014-04-10 22:44:13 -04:00
Eric Haszlakiewicz
f84d9c55db Update the ChangeLog with the changes for the 0.12 release. 
Bump the version in the release checklist.
 2014-04-10 21:07:20 -04:00