f357081b57
Not all systems (e.g. osx) have malloc.h, include stdlib.h instead.
Eric Haszlakiewicz
2020-04-08 02:53:48 +00:00
2782a6b62c
Try yet again to fix the osx build, this time do set +e
Eric Haszlakiewicz
2020-04-08 02:39:03 +00:00
a86ae1df9a
Another attempt at debugging the travis osx build, this time just ignore errors.
Eric Haszlakiewicz
2020-04-08 02:28:02 +00:00
829e0829dd
Wait a while before exiting travis to allow output to flush.
Eric Haszlakiewicz
2020-04-08 02:17:14 +00:00
cf8421c36d
Apparently cmake is already installed on travis osx builds. Try another approach to figure out what was failing.
Eric Haszlakiewicz
2020-04-08 02:02:25 +00:00
fb0b653612
Install cmake on osx travis builds. s/make check/make test/
Eric Haszlakiewicz
2020-04-08 01:45:49 +00:00
a3b82cbc77
Perform the travis build in a subdir, so the distcheck target works.
Eric Haszlakiewicz
2020-04-08 01:34:22 +00:00
677a8ccf44
Switch travis to use cmake instead of autoconf.
Eric Haszlakiewicz
2020-04-08 01:21:11 +00:00
19bbf2c069
Add includes and split off json_types.h to help ensure that headers can be included in any order.
Eric Haszlakiewicz
2020-04-06 13:55:27 +00:00
5e19c26cae
Don't let clang-format rearrange Windows includes, since they need to be in a particular order.
Eric Haszlakiewicz
2020-04-06 02:47:34 +00:00
9acc4e9d71
Format random_seed.c with clang-format, with key asm sections excluded.
Eric Haszlakiewicz
2020-04-06 01:52:28 +00:00
9a494081cb
Update the style guide to mention that we're using clang-format now.
Eric Haszlakiewicz
2020-04-06 01:49:14 +00:00
31f1ab2be1
Merge pull request #555 from dota17/chang_format_3
Eric Haszlakiewicz
2020-04-03 00:13:34 -04:00
8b162c4b89
clang-format the files
dota17
2020-03-28 10:25:00 +08:00
c117d8a8a8
add the disabling formatting coments and adjust the partial code manuly
dota17
2020-03-27 13:04:50 +08:00
f69fbd897b
Added documentation for camke-configure
dota17
2020-02-25 15:01:05 +08:00
3c3b5920f7
add uint64 data to json-c
dota17
2020-02-20 15:17:05 +08:00
c684b1d40b
add coveralls auto tool to json-c
dota17
2020-02-17 18:15:15 +08:00
518f337ce8
Issue #539: use a internal-only serializer function in json_object_new_double_s() to avoid potential conflicts with user code that uses the json_object_userdata_to_json_string serializer. Also, document the serializer-resetting behavior of json_object_set_double().
Eric Haszlakiewicz
2020-02-14 03:48:02 +00:00
4bf7ffa984
Issue #539: be sure to clean up at the end of test_set_value.
Eric Haszlakiewicz
2020-02-14 03:25:46 +00:00
ae13ca524a
Issue #539: reset the serializer when json_object_set_double() is called and the current serializer is the one that json_object_new_double_s() used.
Eric Haszlakiewicz
2020-02-13 03:11:10 +00:00
0ffdbb2395
Merge pull request #531 from dota17/utf8test
Eric Haszlakiewicz
2020-02-05 21:56:06 -05:00
1934eddf29
Merge pull request #536 from dota17/new_null
Eric Haszlakiewicz
2020-01-21 23:23:53 -05:00
6c55f65d07
Set cmake policy CMP0075, to have check_include_file use the value of CMAKE_REQUIRED_LIBRARIES (currently, adds -lm). See issue #510.
Eric Haszlakiewicz
2019-12-06 00:15:14 -05:00
0819a55ffb
Undefine NDEBUG for tests - cmake version. See issue #501.
Eric Haszlakiewicz
2019-12-05 23:18:59 -05:00
37b4da6b92
Merge pull request #501 from andy5995/iss_406-2
Eric Haszlakiewicz
2019-12-05 23:18:46 -05:00
581b94b3bd
Add a shim script to ease shift from autoconf to cmake.
Eric Haszlakiewicz
2019-12-01 23:42:40 -05:00
11a638048d
Add a few missing features to the cmake setup that are present in configure.ac: Include all compiler warnings, and provide DISABLE_WERROR to make them not be errors. Define _REENTRANT, if setting it works. Set -Bsymbolic-functions, and provide DISABLE_BSYMBOLIC to turn that off. Implement the check for HAS_GNU_WARNING_LONG
Eric Haszlakiewicz
2019-11-26 23:01:27 -05:00
a92e6d2c28
Set the soversion in the cmake built library, and arrange for the file name to be generated appropriately too.
Eric Haszlakiewicz
2019-11-25 23:26:48 -05:00
41f434e89f
Fix test_util_file for VS2013 too, but skip all the tests for anything older than that because the limitations are too inconvenient.
Eric Haszlakiewicz
2019-11-23 23:55:04 -05:00
b99be9cf4e
Fix up the test_util_file test for builds on Windows VS2015.
Eric Haszlakiewicz
2019-11-23 23:14:24 -05:00
7f30afc6e5
Fix some Windows compile issues, add JSON_EXPORT's, fix bogus character escapes, define __func__ and omit unistd.h if needed.
Eric Haszlakiewicz
2019-11-23 20:31:14 -05:00
f19abcf981
Get the cmake build a bit closer to the autoconf one: include json_visit.h, and fix the version stamped in json-c.pc.
Eric Haszlakiewicz
2019-11-23 15:34:23 -05:00
bdaff94e9a
Build and run the tests as part of the cmake build.
Eric Haszlakiewicz
2019-11-23 15:15:48 -05:00
25aedddcdf
Fix memory leaks in test_double_serializer, and make sure all tests return 0 at the end of main().
Eric Haszlakiewicz
2019-11-23 12:05:28 -05:00
3d3b014971
Add a quick way (JSONC_TEST_TRACE=1) to turn on shell tracing in tests.
Eric Haszlakiewicz
2019-11-23 12:03:27 -05:00
b1ad748842
Extend test_double_serializer to check NaN and Infinity handling.
Eric Haszlakiewicz
2019-11-22 22:56:33 -05:00
af8dd4a307
Define vars earlier to fix old Windows builds.
Eric Haszlakiewicz
2019-11-10 20:35:30 -05:00
baed9983b3
Add a json_object_from_fd_ex() function, to allow the max nesting depth to be specified.
Eric Haszlakiewicz
2019-11-10 00:12:27 -05:00
ac26ea9c5b
Add a test for serializing the double value -1.0.
Eric Haszlakiewicz
2019-11-10 00:10:28 -05:00
ddd049045d
Merge pull request #505 from grdowns/vcpkg-instructions
Eric Haszlakiewicz
2019-09-26 22:23:52 -04:00
eae040a84a
Issue #488: use JSON_EXPORT on functions so they are properly exported on Windows.
Eric Haszlakiewicz
2019-09-08 22:42:36 -04:00
374ffe87c6
Issue #463: fix newlocale() call to use LC_NUMERIC_MASK instead of LC_NUMERIC, and remove incorrect comment. The second call to newlocale() with LC_TIME accidentally made things work because LC_TIME == LC_NUMERIC_MASK on some platforms.
Eric Haszlakiewicz
2019-09-08 22:27:30 -04:00
05b41b159e
Add a json_tokener_get_parse_end() function to replace direct access of tok->char_offset.
Eric Haszlakiewicz
2019-09-08 21:35:37 -04:00
087534c030
Minor cleanup of includes in a couple of tests.
Eric Haszlakiewicz
2019-09-08 21:34:13 -04:00
d0b87ee87b
Add an explicit cast to double to squash a -Wimplicit-int-float-conversion warning. Though we will no longer be comparing exactly against INT64_MAX, this is ok because any value of that magnitude stored in a double will *also* have been rounded up, so the comparison will work appropriately.
Eric Haszlakiewicz
2019-08-12 00:30:45 +00:00