summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Put the most recent image first in appveyor builds.newer-appveyorEric Haszlakiewicz2021-11-291-2/+5
* Skip most "Release" builds. s/b_config/CONFIGURATION/ to fix artifact creation.Eric Haszlakiewicz2021-11-291-3/+17
* There doesn't seem to be a way to extend the appveyor build matrix for just o...Eric Haszlakiewicz2021-11-271-20/+77
* Use the newer appveyor images to build for VS2017 and VS2019. Trim the numbe...Eric Haszlakiewicz2021-11-271-16/+30
* Note the need to also set CTEST_OUTPUT_ON_FAILURE to get test outputEric Haszlakiewicz2021-11-261-1/+1
* Merge pull request #732 from DiracResearch/fix/static_include_dirsEric Hawicz2021-11-114-9/+14
|\
| * Fix uninitialized value error for clang-8 msanRobert Bielik2021-11-111-3/+3
| * Fix for clang ub sanitizerRobert Bielik2021-11-112-6/+6
| * Add target include dirs for static library as wellRobert Bielik2021-11-111-0/+5
|/
* Merge pull request #727 from jobol/propo2Eric Hawicz2021-10-225-8/+19
|\
| * Really use prefix JSON_C_OBJECT_ADD_*José Bollo2021-10-195-8/+19
* | Merge pull request #729 from DeX77/patch-1Eric Hawicz2021-10-171-1/+2
|\ \ | |/ |/|
| * * don't assume includedirDeX772021-10-151-1/+2
|/
* Merge pull request #726 from leongross/fix/test-cmake3.1Eric Hawicz2021-10-092-2/+2
|\
| * fix cmake version for testsLeon Gross2021-10-062-2/+2
|/
* Merge pull request #722 from imaami/fix-json_tokener_new_ex-use-after-freeEric Hawicz2021-09-041-1/+1
|\
| * Fix use-after-free in json_tokener_new_ex()Juuso Alasuutari2021-09-041-1/+1
|/
* Merge pull request #718 from Pawday/masterEric Hawicz2021-07-311-6/+9
|\
| * Setted cmake "uninstall" target to exist in unix like operating systems onlyPawday2021-07-261-6/+9
|/
* Add workaround for Visual Studio not knowing about "inline".Eric Haszlakiewicz2021-07-251-0/+7
* Switch the Travis build to use osx_image: xcode12.5, in an attempt to avoid t...Eric Haszlakiewicz2021-07-251-1/+1
* Merge some old work to include (some of) PR #464 into the current master branch.Eric Haszlakiewicz2021-07-2527-110/+274
|\
| * Only define an "uninstall" target if it's not already defined (e.g. by projec...Eric Haszlakiewicz2021-07-251-4/+6
| * Merge pull request #714 from Hex052/clang-format_AfterCaseLabelEric Hawicz2021-07-051-0/+2
| |\
| | * Add AfterCaseLabel to .clang-formatHex0522021-07-041-0/+2
| |/
| * If inttypes.h is present, use it, even on Windows.Eric Haszlakiewicz2021-06-131-1/+4
| * Issue #709: adjust some include guards to be a bit more json-c specific.Eric Haszlakiewicz2021-06-024-8/+8
| * Merge pull request #706 from davidjmccann/masterEric Hawicz2021-05-151-2/+2
| |\
| | * Merge branch 'json-c:master' into masterDavid McCann2021-05-1350-1360/+2427
| | |\ | | |/ | |/|
| * | Merge pull request #696 from ssrlive/masterEric Hawicz2021-05-015-4/+8
| |\ \
| | * | To avoid target exe file export JSON functions.ssrlive2021-03-025-4/+8
| * | | Merge pull request #701 from commodo/configurable-optsEric Hawicz2021-04-174-28/+43
| |\ \ \
| | * | | json_pointer: allow the feature to be disabledAlexandru Ardelean2021-04-164-5/+18
| | * | | tests: CMakeLists.txt: move test names to variableAlexandru Ardelean2021-04-161-24/+26
| |/ / /
| * | | Merge pull request #700 from Philosoph228/werror-fixEric Hawicz2021-04-141-1/+0
| |\ \ \ | | |/ / | |/| |
| | * | random_seed: fix unused variable for win32 buildPhilosoph2282021-04-131-1/+0
| |/ /
| * | Add a DISABLE_EXTRA_LIBS option to skip using libbsd, per @neheb's request on...Eric Haszlakiewicz2021-02-152-1/+6
| * | If arc4random is used, don't bother compiling in the other fallback methods s...Eric Haszlakiewicz2021-02-131-11/+30
| * | Merge pull request #694 from ihsinme/patch-1Eric Hawicz2021-02-061-3/+3
| |\ \
| | * | Update json_object.cihsinme2021-02-051-3/+3
| |/ /
| * | Iesue #692: use arc4random() if it's available (in libc on BSD systems, and l...Eric Haszlakiewicz2021-01-133-2/+28
| * | Keep the doc directory in the nodoc release tarball, just exclude its contents.Eric Haszlakiewicz2021-01-131-1/+1
| * | Merge pull request #674 from ploxiln/random_seed_err_continueEric Hawicz2021-01-121-40/+29
| |\ \
| | * | random_seed: on error, continue to next methodPierce Lopez2020-10-071-40/+29
| * | | Merge pull request #689 from neheb/patch-1Eric Hawicz2020-12-181-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | fix compilation with clangRosen Penev2020-12-171-1/+1
| |/ /
| * | Merge pull request #667 from stoeckmann/regressionEric Hawicz2020-09-111-0/+2
| |\ \
| | * | Fixed test1 regression.Tobias Stoeckmann2020-09-111-0/+2
| |/ /
| * | Merge pull request #665 from stoeckmann/tokenerEric Hawicz2020-08-241-0/+6
| |\ \
| | * | Handle allocation failure in json_tokener_new_exTobias Stoeckmann2020-08-221-0/+6
View Lorry Controller Status