Commit Graph
27 Commits
Author SHA1 Message Date
Kevin Branigan a6a75645e4 Merge pull request #26 from nagamalli9999/master
Using values in powers of two for cJSON_* constants
2016-03-06 20:10:15 +00:00
Kevin Branigan dbf16a0eb8 Merge pull request #31 from ChristianSch/master
fixed segmentation fault for non-json input / provided test case
2016-03-06 20:09:02 +00:00
Kevin Branigan e70366a65a Merge pull request #29 from schmidtw/master
Publish the libraries and headers to the right directories during 'make install'.
2016-02-16 17:33:32 +00:00
Kevin Branigan 53b7e74c9c Merge pull request #27 from nagamalli9999/makefile-uninstall
Added uninstall rule to Makefile
2016-02-11 13:09:29 -05:00
Kevin Branigan e95313adad Merge pull request #24 from FSMaxB/fix_code_order
Fix printing of empty string pointers
2015-10-25 23:48:38 -04:00
Kevin Branigan d4906be4f0 Merge pull request #23 from FSMaxB/format_fix
Fix format problem with empty objects
2015-10-25 22:02:33 -04:00
Kevin Branigan 361b9a58cb Merge pull request #19 from FSMaxB/fix_boolean
fix boolean expression
2015-10-18 17:03:47 -04:00
Kevin Branigan 99c46e7661 Merge pull request #20 from FSMaxB/fix_memory_leaks
fix memory leaks
2015-10-18 17:03:25 -04:00
Kevin Branigan c7241f5314 Merge pull request #22 from FSMaxB/unreachable_line
Remove line that will never be executed
2015-10-18 17:03:03 -04:00
Kevin Branigan 1a20eb8494 Fixed linux compile to support fpclassify (issue #18) 2015-10-05 13:46:14 -04:00
Kevin Branigan 8865d869db cJSON_HasObjectItem didn’t compile 2015-10-01 12:03:27 -04:00
Kevin Branigan 322e440e78 Merge pull request #16 from npi3pak/patch-1
README.md: fixed formatting
2015-10-01 11:38:53 -04:00
Kevin Branigan 11fb0d0215 Merge pull request #15 from dieyushi/master
add new macro for iterating over an array
2015-10-01 11:38:33 -04:00
Kevin Branigan 1e1de63244 Merge pull request #13 from rmeertens/master
added cJSON_HasObjectItem
2015-10-01 11:37:44 -04:00
Kevin Branigan 11b8c97f41 Merge pull request #17 from Scypho/master
Handle invalid numbers
2015-10-01 11:36:19 -04:00
Kevin Branigan affedd65ba Merge pull request #11 from etodd/win-math-lib-fix
Remove "m" library dependency on Windows.
2015-08-20 12:35:07 -04:00
Kevin Branigan a819694712 Merge pull request #10 from ajaybhargav/master
Update gitignore to avoid tracking unwanted files
2015-08-12 11:10:06 -04:00
Kevin Branigan f86b9bdfcf Merge pull request #9 from anton-sergeev/master
Merge latest upstream code (svn rev. 73) into github fork
2015-07-27 21:33:42 -04:00
Kevin Branigan 2bd1e80f6c Merge pull request #8 from anton-sergeev/master
Add CMakeLists.txt
2015-07-15 10:34:08 -04:00
Kevin Branigan 7632993ebe Merge pull request #7 from DongwenHuang/master
Update cJSON.c
2015-06-15 10:59:20 -04:00
Kevin Branigan 0fd1435f4b Merge pull request #6 from DongwenHuang/master
Update test.c
2015-06-12 14:25:52 -04:00
Kevin Branigan 2ffefcec73 Merge pull request #4 from rafaeldias/master
Fixed issue with ansi (single-line comments) and updated Makefile for compiling dynamic and static lib.
2015-02-03 00:31:11 -05:00
Kevin Branigan 65de016c38 a few more README changes 2011-08-22 00:55:11 -04:00
Kevin Branigan b051ed05d7 updated Makefile, README and gitignore 2011-08-22 00:52:03 -04:00
Kevin Branigan ebba183f1e updated README markdown, gitignore, added the Makefile and fixed weird comments in test.c 2011-08-22 00:47:25 -04:00
Kevin Branigan 4cc55858fd renamed README to README.md 2011-08-22 00:44:33 -04:00
Kevin Branigan fc0df31a18 init commit 2011-08-22 00:43:38 -04:00