Jose Bollo
d189d7b5ff
Improve pkgconfig setting
This changes allows to use #include <json-c/json.h>
instead of just #include <json.h>
This is normally possible but in some tricky case
this usage is broken without this change.
Here is the case that I encountered. I had to
compile json-c fresh version for some investigations
on newer versions. Then I installed it on my local
environment using option --prefix. After that I
had 2 versions:
- the system wide version in usual locations
/usr/lib and /usr/include
- mine in my HOME directory
Then, as I'm used to include <json-c/json.h>, the
included iheder's version was the system wide one
whereas the linked lib was mine.
Signed-off-by: Jose Bollo <jose.bollo@iot.bzh>
7 years ago
Eric Haszlakiewicz
2327b23d8e
Merge pull request #431 from LeSpocky/cmake
cmake: Bump required version
7 years ago
Alexander Dahl
901d59b29f
cmake: Bump required version
Using 'project(foo VERSION 1.0)' requires CMake 3.0, the VERSION option
is not part of CMake 2.8.7, see:
* https://cmake.org/cmake/help/v2.8.7/cmake.html#command:project
* https://cmake.org/cmake/help/v3.0/release/3.0.0.html#commands
The property C_STANDARD was introduced with CMake 3.1, see:
* https://cmake.org/cmake/help/v3.1/release/3.1.0.html#properties
Signed-off-by: Alexander Dahl <post@lespocky.de>
7 years ago
Eric Haszlakiewicz
3df1f98b4a
Explain why we're not setting the output name for static libraries when on Windows.
7 years ago
Eric Haszlakiewicz
a056893263
Merge pull request #415 from sgbihu/master
Resolve windows name conflict
7 years ago
Eric Haszlakiewicz
e3752b5894
Issue #418 : Fix docs for json_util_from_fd and json_util_from_file to say that they return NULL on failures.
7 years ago
Eric Haszlakiewicz
c1c71097a1
Issue #419 : document that NULL may be passed to json_object_put().
7 years ago
Eric Haszlakiewicz
fb042f449b
Merge pull request #421 from lt-holman/install_header_file
install json_object_iterator.h header file
7 years ago
Keith Holman
37a2edf468
install json_object_iterator.h header file
When building the project using cmake then installing it. The
definitions in `json_object_iterator.h` are required but not installed
by the cmake install rule. This patch adds the `json_object_iterator.h`
file to the list of files to install.
Signed-off-by: Keith Holman <keith.holman@windriver.com>
7 years ago
Eric Haszlakiewicz
4bbc72f633
Merge pull request #420 from angelskieglazki/master
arraylist: Fixed names of parameters for callback function
7 years ago
max
7a4759f165
arraylist: Fix names of parameters for callback function
7 years ago
Eric Haszlakiewicz
4414d068b3
Always create debug info (pdb file) even for release builds.
7 years ago
Eric Haszlakiewicz
7038bb8061
Try the appveyor changes again, using %Configuration% instead of "Debug"
7 years ago
Eric Haszlakiewicz
dfc0fddf22
Include the json-c.lib, .pdb and .exp files in the zip file created by the appveyor build, since it seems they're needed for linking and debugging.
7 years ago
Liang, Gao
0b3616d580
Resolve windows name conflict
1. The windows dll will output the lib and dll, and rename the static
lib will have conflict on windows.
2. Delete rename code to dismiss the conflict.
7 years ago
Eric Haszlakiewicz
c75ebe8973
Merge pull request #410 from janczer/fix-typos
Fixed typos
7 years ago
janczer
8bd62177e7
Fixed typos
7 years ago
Eric Haszlakiewicz
f8c632f579
Issue #407 : fix incorrect casts in calls to ctype functions (isdigit and isspace) so we don't crash when asserts are enabled on certain platforms and characters > 128 are parsed.
7 years ago
Eric Haszlakiewicz
da4b34355d
Add an parse test for content starting with a UTF8 BOM, which is _not_ a valid start to a JSON message.
7 years ago
Eric Haszlakiewicz
104aef0a6e
Update the change log for the 0.13.1 release.
7 years ago
Eric Haszlakiewicz
2fd95844c3
Issue #396 : check for toolchain compatibilty with _REENTRANT before adding it to CFLAGS.
7 years ago
Eric Haszlakiewicz
1e301d94be
Merge pull request #402 from derwolfe/fuzz
Add fuzzers from OSS-Fuzz
7 years ago
Chris Wolfe
1e08150838
pull in fuzzers, add CI scripts later
7 years ago
Eric Haszlakiewicz
f8eb1dec64
Merge pull request #399 from jonathan-wiens/bugfix/initialize_variable
Avoid uninitialized variable warnings
7 years ago
Jonathan Wiens
cdc4e9f64b
Avoid uninitialized variable warnings
Fix json_object_object_foreach to avoid uninitialized variable warnings
using ANSI C or MSC.
7 years ago
Eric Haszlakiewicz
250de31f17
Bump the major version of the .so library generated up to 4.0 to avoid conflicts because some downstream packagers of json-c had already done their own bump to ".so.3" for a much older 0.12 release.
7 years ago
Eric Haszlakiewicz
c652b6ad29
PR#394: fix breakage with VS build.
7 years ago
Eric Haszlakiewicz
d5da847f51
PR#394: don't always append the ".0" if the double value rounds to zero because some custom formats *will* include it (e.g. %.2f).
Also try to accomodate formats to explicitly exclude the decimal (e.g. %.0f).
7 years ago
Eric Haszlakiewicz
0992aac61f
Remove the TRUE and FALSE defines.
7 years ago
Eric Haszlakiewicz
cfd09c87f0
Merge pull request #393 from besser82/enhancement/unsigned_refcount
json_object_private: Use unsigned 32-bit integer type for refcount
7 years ago
Björn Esser
c233f5c05e
json_object_private: Use unsigned 32-bit integer type for refcount
7 years ago
Eric Haszlakiewicz
5ea6a05bfa
Merge pull request #389 from besser82/bugfix/invalid_free
json_object: Avoid double free (and thus a segfault) when ref_count gets < 0
7 years ago
Björn Esser
9aca3b6a08
json_object: Avoid invalid free (and thus a segfault) when ref_count gets < 0
7 years ago
Eric Haszlakiewicz
8c214902d9
Merge pull request #386 from besser82/bugfix/aclocal_amflags
Makefile: Add ACLOCAL_AMFLAGS
7 years ago
Eric Haszlakiewicz
e411b1a36e
Merge pull request #391 from rikardfalkeborn/fix-const-function-define
Fix non-GNUC define for JSON_C_CONST_FUNCTION
7 years ago
Rikard Falkeborn
84dcc01da1
Fix non-GNUC define for JSON_C_CONST_FUNCTION
7 years ago
Björn Esser
87556afe2a
Makefile: Add ACLOCAL_AMFLAGS
This is recommended by the libtool manual.
7 years ago
Eric Haszlakiewicz
5b6d62259a
Apply gcc's "const" attribute to the json_c_object_sizeof() function as an optimizer hint. Also, rename that function from json_object_sizeof().
7 years ago
Eric Haszlakiewicz
94fd101601
Merge pull request #388 from besser82/enhancement/json_object_sizeof
json_object: Add size_t json_object_sizeof()
7 years ago
Eric Haszlakiewicz
25afa92ed5
Merge pull request #387 from LeSpocky/doc
doc: Use other doxygen feature to specify mainpage
7 years ago
Björn Esser
c123a1c21b
json_object: Add size_t json_object_sizeof()
7 years ago
Alexander Dahl
89747ac758
doc: Use other doxygen feature to specify mainpage
Previously a special tag was added to README.md to make this the
main page in Doxygen generated docs. When viewing the README on the
GitHub page this tag was not hidden.
After upgrading to Doxygen 1.8.8 (and above) in changeset
219025727d
a new Doxygen feature can be
used to specify the main page: Since release 1.8.3 Doxygen has a special
option to set a markdown file as main page. When using this option we
can drop the tag, making the README rendered by GitHub nice to look at.
Fixes: ae66b24369
7 years ago
Eric Haszlakiewicz
a19031411d
Remove the previously deprecated lh_table_lookup() function, in favor of lh_table_lookup_ex().
7 years ago
Eric Haszlakiewicz
f83cf244cd
Remove the previously deprecated bits.h and the lh_abort() function.
7 years ago
Eric Haszlakiewicz
963e707ca4
Drop mention of README-WIN32.html in the release checklist.
7 years ago
Eric Haszlakiewicz
0631c37c7f
Update the master branch to version 0.13.99
7 years ago
Eric Haszlakiewicz
8c4a941475
Tweak the release checklist slightly to fix problems noticed during this past release process.
7 years ago
Eric Haszlakiewicz
d447fbca77
Don't include private headers when installing.
7 years ago
Eric Haszlakiewicz
d582d3ae5a
Undeprecate the array_list, lh_table and printbuf typedefs, but move each to the corresponding header files.
7 years ago
Eric Haszlakiewicz
8c82f0e5c3
Squash doxygen warnings, and make a few slight improvements to the docs.
7 years ago