Stuart Walsh
75d7409c4e
Fix uninitialised variable compile warning, and also fix unused-when-used warning
10 years ago
Eric Haszlakiewicz
cbedf2f7ca
Merge pull request #149 from cicku/patch-2
SONAME bump
10 years ago
Eric Haszlakiewicz
e4fce5d6ae
Merge pull request #171 from Nzbuu/vs2010_build
Update configuration for VS2010 and win64
10 years ago
Eric Haszlakiewicz
e1eb298de1
Merge pull request #182 from tpetazzoni/libm-fix
Link against libm when needed
10 years ago
Eric Haszlakiewicz
82a1316f76
Merge pull request #180 from yegorich/silent
Enable silent build by default
10 years ago
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>
10 years ago
Yegor Yefremov
36b0169ed6
Enable silent build by default
10 years ago
Mark Swoope
cdca9d3c8e
Added array_list_del_idx and json_object_array_del_idx
10 years ago
James Myatt
736f4b3581
Build random_seed.c as well
10 years ago
James Myatt
9d3d8d6fc0
Add x64 build configurations
10 years ago
James Myatt
e1a3f33a26
Set CompileAsCpp flag (Required for vs2010/winsdk71)
Revert some project settings to defaults
10 years ago
James Myatt
d5baa0381f
Update VS project to include current source files
10 years ago
James Myatt
18b3c49296
Use more appropriate casts
10 years ago
James Myatt
bf32650c83
Add missing include file to random_seed
10 years ago
James Myatt
720d566d03
Define macros from inttypes.h when not available
10 years ago
James Myatt
9be71700eb
json_tokener requires INF and NAN
10 years ago
James Myatt
72310c87a5
Define INFINITY and NAN when missing
10 years ago
James Myatt
0137103f4b
Include config.h in linkhash so that HAVE_ENDIAN_H is defined (if available)
10 years ago
James Myatt
a74f6b2867
Updated config for vs2010/winsdk71 as well as vs2013
Define JSON_C_HAVE_INTTYPES_H in json_config.h.win32 only
10 years ago
Eric Haszlakiewicz
68d856f618
Merge pull request #168 from bugness-chl/master
Tightening the number parsing algorithm
10 years ago
Eric Haszlakiewicz
7e3a6c6b9d
Merge pull request #163 from sixlettervariables/fix-win32-build-problems
Fix Win32 build problems
10 years ago
Eric Haszlakiewicz
da62fca305
Merge pull request #144 from mhei/master
Introduce json_object_from_fd
10 years ago
Eric Haszlakiewicz
484ca368f0
Slight style tweaks to the bsearch changest.
10 years ago
Eric Haszlakiewicz
a500c1f0b5
Merge pull request #155 from LeSpocky/bsearch
add bsearch for arrays
10 years ago
Eric Haszlakiewicz
9db3099572
Merge pull request #156 from jubalh/master
Remove trailing whitespaces
10 years ago
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.
10 years ago
Christopher Watford
4d18d39d99
Adds json_config.h.win32 to project. Adds VS2k13 project.
10 years ago
Christopher Watford
0609a5729c
Fixes #160 'missing header file on windows'
10 years ago
Eric Haszlakiewicz
ec4879ac5b
Merge pull request #153 from LeSpocky/doc
improve doc for json_object_to_json_string()
11 years ago
Eric Haszlakiewicz
6ec6fdaf8c
Merge pull request #151 from mjchinn/json_type-comma
Remove json_type enum trailing comma
11 years ago
Eric Haszlakiewicz
2c722277ee
Merge pull request #150 from ams-cs/master
Fix build using MinGW.
11 years ago
Eric Haszlakiewicz
f88db708ac
Merge pull request #141 from AlexandruCostache/master
Removed duplicate check in random_seed test - bug #140
11 years ago
Michael Vetter
fcf5ad1bd6
Remove trailing whitespace
11 years ago
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.
11 years ago
Alexander Dahl
37f5d8696d
improve doc for json_object_to_json_string()
11 years ago
Michael J. Chinn
048dcf288a
Remove json_type enum trailing comma
11 years ago
Andrew Stubbs
ca0ebe0f71
Fix build using MinGW.
MinGW requires wincrypt.h.
GCC does not support #pragma comment, which trips Werror.
11 years ago
Christopher Meng
db833f2411
SONAME bump
The last json_tokener_errors change affects the binary package, we need a bump to solve the issue.
See [this bug of postgis.](https://bugzilla.redhat.com/show_bug.cgi?id=1123785 )
11 years ago
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>
11 years ago
Alexandru Costache
4841c48f81
Removed duplicate check in random_seed test - bug #140
11 years ago
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.
11 years ago
Eric Haszlakiewicz
1da0599e0e
Fix the definition of the error_description() macro in bits.h now that json_tokener_errors[] is not exported.
11 years ago
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.
11 years ago
Eric Haszlakiewicz
92a7740e90
Reformat some code in json_object.c
11 years ago
Eric Haszlakiewicz
795e9151a1
Add an empty README file to placate autoconf.
11 years ago
Eric Haszlakiewicz
4569e3e430
Fix minor typo in README file.
11 years ago
Eric Haszlakiewicz
40aab4c502
Merge pull request #133 from haneefmubarak/patch-1
Update and rename README to README.md
11 years ago
Eric Haszlakiewicz
332a594fd4
Merge pull request #132 from pkoretic/master
Remove unused variable 'size'
11 years ago
Haneef Mubarak
7870978c2e
Update README.md
- code blocks
- slight text changes (rewording)
- pretty printing
11 years ago
Haneef Mubarak
23620b827c
Update and rename README to README.md
Markdownify + fix a few errors here and there
11 years ago