aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-08-15Check for isnan() and isinf() by linkingisnan-isinf-checksPetri Lehtinen5-4/+47
2013-08-06doc: Add an example for circumventing problems with Windows heapsPetri Lehtinen1-1/+6
2013-07-27Fix memory leaks and warnings in github_commits.cPetri Lehtinen1-10/+22
2013-07-23Update copyrights for 2013Petri Lehtinen41-41/+41
2013-07-21Fix integer overflow in jsonp_strdup()Petri Lehtinen1-1/+6
Fixes #129.
2013-07-08Make the argument of json_deep_copy() constPetri Lehtinen3-13/+21
Fixes #126.
2013-07-01Merge pull request #128 from JoakimSoderberg/lex_unget_unsave_fixPetri Lehtinen1-1/+10
BUGFIX: Compilation error with -DNDEBUG defined.
2013-06-26BUGFIX: Compilation error with -DNDEBUG defined.Joakim Soderberg1-1/+10
When building a "MinSizeRel" with CMake I get a compilation error in lex_unget_unsave. This is because assertions are turned off using -DNDEBUG: ``` /usr/bin/gcc -DHAVE_CONFIG_H -fPIC -Os -DNDEBUG -Ijansson/build/include -Ijansson/build/private_include -Wall -Wextra -Wdeclaration-after-statement -Werror -o CMakeFiles/jansson.dir/src/load.c.o -c jansson/src/load.c jansson/src/load.c: In function âx_unget_unsaveâjansson/src/load.c:256:14: error: variable â set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors ``` This will then remove the insert, which makes the "d" variable unused, which is treated as an error since we have -Wall set. We can't simply get rid of the variable either and put the strbuffer_pop call in the assert call, since it's a macro and would remove the call entirely. So I simply added a check for NDEBUG to fix it.
2013-06-25Merge pull request #127 from cryptobiote/masterPetri Lehtinen1-4/+19
Adding option for MSVC for those who are linking statically.
2013-06-25Update CMakeLists.txtcryptobiote1-5/+5
2013-06-20Adding option for MSVC for those who are linking statically.cryptobiote1-1/+16
2013-06-13Merge pull request #125 from jjwchoy/masterPetri Lehtinen1-0/+2
Prevent compiler warning
2013-06-13Prevent unused-variable warningJason Choy1-0/+2
2013-06-12Tweak the JSON_DECODE_INT_AS_REAL test introduced in #123Petri Lehtinen1-6/+10
Only run the imprecision part if json_int_t is long long, otherwise the imprecision cannot be tested against json_int_t. Also, convert the double value to json_int_t before checking the imprecision, because otherwise the json_int_t is converted to double and the imprecision happens in the "wrong direction".
2013-06-12Fix indentation in docsPetri Lehtinen1-1/+1
2013-06-11Merge pull request #123 from jjwchoy/decode-ignore-intPetri Lehtinen5-5/+51
Implemented a decode option to only decode numbers to reals
2013-06-11Using jsonp_strtod instead of casting to double to catch double overflowJason Choy3-5/+23
2013-06-11Changed :versionadded for JSON_DECODE_INT_AS_REAL docsJason Choy1-1/+1
2013-06-11Renamed flag to JSON_DECODE_INT_AS_REAL and added documentationJason Choy5-7/+18
2013-06-09Merge pull request #120 from paulharris/mine_pre_2.5Petri Lehtinen2-2/+8
Adjust CMakeLists.txt and .def: add _d postfix onto jansson_d.lib/dll
2013-06-09Added a simple test for the JSON_DECODE_NO_INT optionJason Choy1-0/+12
2013-06-09Implemented a decode option to only decode numbers to reals and never integersJason Choy2-1/+6
2013-06-07Merge pull request #121 from jjwchoy/masterPetri Lehtinen1-2/+2
Added missing return valua check in test
2013-06-07Added missing rv check - caught by clangJason Choy1-2/+2
2013-06-02Adjust CMakeLists.txt and .def: add _d postfix onto jansson_d.lib/dllPaul Harris2-2/+8
Had to remove the "LIBRARY" line from jansson.def, which was optional, and was overriding CMake's desire for a specific name.
2013-05-21Don't shadow the stdlib function index() with arg namesPetri Lehtinen1-4/+4
Fixes #119.
2013-05-12Merge pull request #118 from dtgriscom/masterPetri Lehtinen4-2/+56
Added json_array_foreach(), parallelling json_object_foreach()
2013-05-12Fixed "comparison between signed and unsigned" warningDaniel Griscom2-2/+2
2013-05-12Removed (non-functioning) printfs from test codeDaniel Griscom1-6/+0
2013-05-12Added test cases and documentation for json_array_foreach()Daniel Griscom3-2/+57
2013-05-12Add json_array_foreach() #define, parallelling json_object_foreach()Daniel Griscom1-0/+5
2013-05-06Merge pull request #115 from JoakimSoderberg/cmake_pkgconfigPetri Lehtinen2-8/+32
Cmake pkgconfig
2013-05-06Create and install the pkg-config file jansson.pc for CMake.Joakim Soderberg1-3/+23
Use the same jansson.pc.in file as the ./configure script does to generate the jansson.pc file for pkg-config. Also make an install rule for this.
2013-05-06Fix the cmake Sphinx find script.Joakim Soderberg1-5/+9
The cmake sphinx find script version parsing assumes a format of 1.2.3, but sphinx version can be 1.2b3 as well, so parse those correctly as well.
2013-04-29jansson:doc: modified incref docAndrei Epure1-1/+1
Signed-off-by: Andrei Epure <epure.andrei@gmail.com>
2013-04-29test:suites:api: modified error messageAndrei Epure1-1/+1
In the "/* perform the same update again */" area the error message should be "unable to update an non-empty object" instead of "unable to update an empty object". Signed-off-by: Andrei Epure <epure.andrei@gmail.com>
2013-04-29Merge pull request #112 from JoakimSoderberg/fpic_cmake_supportPetri Lehtinen3-55/+469
Additional CMake documentation + Fpic cmake support
2013-04-25Fixed some minor issues.Joakim Soderberg2-46/+6
2013-04-24Added more detailed CMake documentation.Joakim Soderberg3-55/+505
- Also added better FindSphinx support so that we can detect the version and not have a fatal error if it's too old. - Added support for building latex documentation with -DBUILD_LATEX. Off by default. - Added suppor for building man pages with -DBUILD_MAN. On by default (unless sphins is too old to support it).
2013-04-18Use -fPIC when possible.Joakim Soderberg1-0/+4
So that we can link the library statically to shared libraries.
2013-04-15Document CMake build process, deprecate the VS2010 projectPetri Lehtinen1-0/+20
2013-04-15Tweak Android build documentationPetri Lehtinen1-2/+5
2013-04-15Merge branch 'master' of git://github.com/svic/janssonPetri Lehtinen4-0/+122
2013-04-15Merge branch '2.4'Petri Lehtinen1-1/+4
2013-04-15Fix the signature again, and also rest of the errorsPetri Lehtinen1-1/+4
Next time, remember to check with -Werror first...
2013-04-15Merge branch '2.4'Petri Lehtinen1-1/+1
2013-04-15Fix the signature of a test functionPetri Lehtinen1-1/+1
2013-04-15Merge branch '2.4'Petri Lehtinen2-0/+24
2013-04-15json_dump*(): Don't crash if json is NULL and JSON_ENCODE_ANY is setPetri Lehtinen2-0/+24
2013-04-11Add android doc.Garner Lee1-0/+5
generated by cgit v1.1 at 2024-10-20 00:21:14 +0000