579f0746f0
Issue #173, follow up to using strtoll to allow this to work on older Windows environments: Use cmake to generate config.h from config.h.win32, including checking for strtoll with cmake, or fall back to _strtoi64 for older MSVC's. Also, add a few missing files to the list of sources to build.
Eric Haszlakiewicz2017-10-03 22:50:29 -04:00
cfbdf7757b
The new cmake-generated VS builds now generate a dynamic .dll instead of a .lib
Eric Haszlakiewicz2017-09-17 21:44:04 -04:00
139eb64b43
For appveyor builds, json_config.h is actually generated in the "include" directory.
Eric Haszlakiewicz2017-09-17 21:35:53 -04:00
66a77d129a
Split the list of cmake headers into public and private ones, and only install the public ones.
Eric Haszlakiewicz2017-09-17 21:27:07 -04:00
8899f3fbfb
Add a "cmake ." line to the appveyor build file to try to get it working again.
Eric Haszlakiewicz2017-09-17 21:25:49 -04:00
e1561ed1df
Remove the Visual Studio project files as they were out of date, and should now be generated by using cmake.
Eric Haszlakiewicz2017-09-06 23:50:03 -04:00
837a249f01
set JSON_C_HEADERS full file name
Haffon2017-09-07 10:39:14 +08:00
e9f9f14f22
if compile with vs2015, enable the "static inline" declare.
Haffon2017-09-07 10:28:26 +08:00
b301f4ea01
rollback api to 0.12
Haffon2017-09-07 10:02:21 +08:00
86a3a6475f
Merge pull request #2 from json-c/master
Haffon2017-09-07 09:33:07 +08:00
548d000891
Undo a bit of 2d1da5ab: handle per-thread formats for double serialization, even if --enable-threading wasn't specified.
Eric Haszlakiewicz2017-09-05 01:56:42 -04:00
b2afca4560
Issue #173: since some sscanf implementations return 0 for non-zero inputs, directly check for "0" in the input.
Eric Haszlakiewicz2017-09-05 01:53:13 -04:00
2d1da5ab13
Add a --enable-threading configure option, and only use the (slower) __sync_add_and_fetch()/__sync_sub_and_fetch() function when it is specified.
Eric Haszlakiewicz2017-09-03 23:37:12 -04:00
8777c9477a
Use AC_CONFIG_MACRO_DIRS to specify path to the ax macros instead of passing -I to autoreconf in autogen.sh.
Eric Haszlakiewicz2017-09-03 22:35:58 -04:00
5b11e9adff
Explicitly check for GCC's atomic functions instead of depending on the __GNUC__ define. Add a comment mentioning the limitation even though the _ref_count value is hanled atomically.
Eric Haszlakiewicz2017-09-02 14:48:17 -04:00
ab0d4dbc69
Merge branch 'pull-211' This is EmielBruijntes' "Atomic updates for the refcount"
Eric Haszlakiewicz2017-09-02 13:54:15 -04:00
447d67d5f3
Issue #349: none of automake's clean targets are suite for really cleaning up everything, so add a local "really-clean" target that does so.
Eric Haszlakiewicz2017-08-30 23:17:24 -04:00
95e174e2fb
Merge pull request #1 from json-c/master
Haffon2017-08-30 00:02:59 +08:00
81f6edbfd5
PR#331: for Visual Studio, use a snprintf/vsnprintf wrapper that ensures the string is terminated.
Eric Haszlakiewicz2017-08-25 01:15:39 -04:00
3141c3976b
1.make it can been compiled with Visual Studio 2010 2.replace json_object_get/put API with json_object_retain/release, as they operate the reference counter, and confused with array_list_get/put_idx. 3.replace array_list_get/put_idx API with array_list_get/insert to make them more clear to use.
Haffon2017-08-22 13:53:47 +08:00
65884f4d9e
Fix parsing doubles for mingw
topilski2017-07-30 07:30:05 +03:00
af87944585
PR #336: fix to previous change, be sure to include string.h when we're using the real strerror.
Eric Haszlakiewicz2017-07-27 20:17:25 -07:00
d8fbfc7aa1
build,travis: drop -enable-strerror-override argument (no longer exists)
Alexandru Ardelean2017-07-19 15:22:36 +03:00
ddce7c28e4
strerror_override: add extern "C" and JSON_EXPORT specifiers for Visual C++ compilers
Alexandru Ardelean2017-07-19 15:10:10 +03:00
fcad0ec015
PR #336: since we can't use function overriding (due to problems with it on OSX) always include the _json_c_strerror function but only enable it with a flag during tests.
Eric Haszlakiewicz2017-07-15 07:12:44 -07:00
730ab7b019
PR #336: since we can't use function overriding (due to problems with it on OSX) always include the _json_c_strerror function but only enable it with a flag during tests.
Eric Haszlakiewicz2017-07-15 07:07:28 -07:00
40317f079e
Allow USE_VALGRIND to be set to anything starting with 0, N or n to disable valgrind during tests.
Eric Haszlakiewicz2017-07-15 07:03:18 -07:00
1d3e97f2ab
Comment out the warning about racy random seed initialization in lh_char_hash(), if you're on a platform where it'll be triggered it just makes it a pain to build.
Eric Haszlakiewicz2017-07-09 15:13:02 -07:00
f7a44ad101
Add extra casts to void * to squash some warning on certain systems (e.g. CentOS w/ gcc 4.1.2).
Eric Haszlakiewicz2017-07-09 15:08:21 -07:00
55ecae3e58
Eliminate static qualifiers on a couple local variables that were causing thread safety issues. Suggested by @rouault in PR #331.
Eric Haszlakiewicz2017-07-09 14:56:18 -07:00
5a99e527ff
Reformat json_object_double_to_json_string_format() to have consistent spacing.
Eric Haszlakiewicz2017-07-08 20:33:28 -07:00
5e33dabda1
Issue #308: improve the build instructions in README.md to include the exact commands to run for installing prerequisites, as mentioned earlier on Issue #308.
Eric Haszlakiewicz2017-07-08 19:35:06 -07:00
fd9b3b2260
Issue #332: fix a long-standing bug in array_list_put_idx() where it would attempt to free previously free'd entries due to not checking the current array length. Add a test that triggers the problem to ensure it stays fixed.
Eric Haszlakiewicz2017-07-08 19:04:35 -07:00
1a94c70336
Add a json_c_set_serialization_double_format() function to set the *library-wide* format for how doubles are written to a serialized JSON output.
Eric Haszlakiewicz2017-06-18 18:04:49 +00:00
8581806558
Make _set_last_err() non-static so it can be used outside of json_util.c
Eric Haszlakiewicz2017-06-04 18:25:51 +00:00
e76ea37772
Merge pull request #325 from rouault/fix_stack_overflow_in_json_object_double_to_json_string_format
Eric Haszlakiewicz2017-05-21 21:35:16 -04:00
2c2deb87f8
Fix stack buffer overflow in json_object_double_to_json_string_format()
Even Rouault2017-05-18 22:36:35 +02:00
0f81ecf5f4
Fix error C3688 when compiling on Visual Studio 2015: invalid literal suffix 'PRId64'; literal operator or literal operator template 'operator ""PRId64' not found
Jason Li2017-03-24 14:53:25 +08:00