Petri Lehtinen
6ce273e2e6
Merge branch '2.3'
2012-06-06 21:10:28 +03:00
Paul Harris
f62b1f5d69
Bugfix: must cast void* to do pointer math
...
Fixes #78 .
2012-06-06 21:09:47 +03:00
Paul Harris
2b87fdcb43
Bugfix: Changed all use of ssize_t to size_t.
...
ssize_t is only used in a test, and its comparing to a size_t variable.
Fixes #77 .
2012-06-06 08:47:17 +03:00
Petri Lehtinen
c0139681cd
Update the documentation to mention Visual Studio 2010 support
2012-05-19 21:22:59 +03:00
Petri Lehtinen
9d6f9511f5
Merge pull request #74 from rogerz/contrib
...
Add vs2010 solution and project, fix warnings under MinGW
2012-05-03 11:31:19 -07:00
Rogerz Zhang
a79f64e155
Fix build warnings under MinGW
2012-05-01 08:02:12 +08:00
Rogerz Zhang
7ca783c3bc
Add vs2010 solution and project
2012-04-30 21:51:07 +08:00
Petri Lehtinen
ff0c05b8f1
Support building on Windows
...
Jansson now builds correctly with Visual C++ Express 2010.
2012-04-29 22:09:29 +03:00
Petri Lehtinen
4601bf71e5
Merge branch '2.3'
2012-04-26 22:11:22 +03:00
Jack Mitchell
c7f86abf6d
fix slight typo in json_pack apiref example
...
Fixes #73 .
2012-04-26 22:10:46 +03:00
Petri Lehtinen
f309e30320
Merge branch '2.3'
2012-04-26 22:09:48 +03:00
Jack Mitchell
233574e8e0
fix slight typo in json_pack apiref example
...
Fixes #73 .
2012-04-26 22:09:29 +03:00
Petri Lehtinen
4a6939ef87
Merge branch '2.3'
2012-04-26 09:00:49 +03:00
Petri Lehtinen
42bc7a3c50
Check for missing args and envvars in run-tests.sh
...
Fixes #71 .
2012-04-26 08:58:36 +03:00
Petri Lehtinen
abdb8d99d7
Merge branch '2.3'
...
Conflicts:
configure.ac
doc/conf.py
src/jansson.h
2012-04-20 21:41:25 +03:00
Petri Lehtinen
ff6e6ee293
jansson 2.3.1
2012-04-20 21:35:00 +03:00
Petri Lehtinen
8b2bfd5586
Merge branch '2.3'
2012-04-18 21:59:10 +03:00
Petri Lehtinen
e46b912f53
Fix tutorial to use Github API v3
...
The v2 API will be shut down on May 1st 2012.
Fixes #65 .
2012-04-18 21:58:52 +03:00
Petri Lehtinen
1581f26a7f
Merge branch '2.3'
...
Closes #70 .
2012-04-18 21:27:26 +03:00
Janne Kulmala
aabfd493d3
load: Change buffer_pos to be a size_t
...
buffer_pos should be type size_t, because it's used to store the
current position in the read buffer. Also, it never can be negative.
2012-04-18 21:21:17 +03:00
Janne Kulmala
bd72efbd80
load: Avoid unexpected behaviour in macro expansion
...
Macros can be dangerous if the inserted arguments are not properly
parenthesised. As macro expansion does a simple replacement, inserting
a certain expression can cause the evaluation order of the macro expression
to change.
2012-04-18 21:21:17 +03:00
Petri Lehtinen
e8fd3e3085
Document and tweak json_load_callback()
...
Change the return value of json_load_callback_t to size_t, as it's
feels more correct. The callback should return (size_t)-1 on failure.
Issue #57 .
2012-03-26 21:53:21 +03:00
Petri Lehtinen
873eddaf19
Merge pull request #60 from rogerz/contrib
...
Ignore the binary test_load_callback
2012-03-25 10:46:45 -07:00
Rogerz
bd2c0c730d
Ignore the binary test_load_callback
2012-03-25 13:22:09 +00:00
Petri Lehtinen
17a51a4bf0
Merge branch '2.3'
2012-03-22 09:02:51 +02:00
Petri Lehtinen
09c39adc55
Add json_load_callback to the list of exported symbols
2012-03-22 09:02:49 +02:00
Petri Lehtinen
cbb80baf03
Merge pull request #57 from rogerz/contrib
...
Add json_load_callback()
2012-03-22 00:00:24 -07:00
Rogerz Zhang
040bd7b0fa
Add json_load_callback()
2012-03-22 14:52:57 +08:00
Petri Lehtinen
2637faa450
Make test stripping locale independent
2012-03-22 08:48:28 +02:00
Petri Lehtinen
952e1d4ba9
Merge branch '2.3'
...
Closes #56 .
2012-03-21 14:03:51 +02:00
Rogerz Zhang
353b5e08ba
Ignore *.exe
2012-03-21 14:03:46 +02:00
Petri Lehtinen
d286e7b753
Merge branch '2.3'
2012-03-20 20:56:00 +02:00
Petri Lehtinen
3c6e36ba2d
Update copyright notices for 2012
2012-03-20 20:55:55 +02:00
Petri Lehtinen
9af64480e1
Merge branch '2.3'
2012-03-20 20:48:36 +02:00
Petri Lehtinen
4ae5736bd0
Make sure strtoll() is available when using long long
2012-03-20 20:47:57 +02:00
Petri Lehtinen
56039ed596
Merge branch '2.3'
2012-03-11 21:16:41 +02:00
Petri Lehtinen
02b915af54
Remove unused declarations
2012-03-11 21:12:52 +02:00
Petri Lehtinen
1eb274c555
Merge branch '2.3'
2012-03-08 15:03:03 +02:00
Petri Lehtinen
6ac6f311b5
Fix tests on shells that don't support the export FOO=bar syntax
2012-03-08 15:01:52 +02:00
Petri Lehtinen
f736e705b2
Merge branch '2.3'
2012-02-12 16:05:35 +02:00
Petri Lehtinen
54d88753a6
Disribute the check-exports tests
2012-02-12 16:05:27 +02:00
Petri Lehtinen
98a99fb2bd
Merge branch '2.3'
2012-02-02 17:03:03 +02:00
Petri Lehtinen
ac97f6f225
doc: Fix the names of library version constants
...
Fixes #52 .
2012-02-02 17:00:35 +02:00
Petri Lehtinen
60fd7ab781
Merge branch '2.3'
2012-01-30 21:23:49 +02:00
Petri Lehtinen
0d64e8ef89
Make test_load.c not depend on the C locale
...
Fixes #51 .
2012-01-30 21:23:18 +02:00
Petri Lehtinen
a894980258
Set master to 2.4 development mode
2012-01-30 20:59:32 +02:00
Petri Lehtinen
f227483846
jansson 2.3
2012-01-27 21:02:12 +02:00
Petri Lehtinen
6cb14dd337
Add support for optional object keys for json_unpack() and friends
...
Initial patch by Andrew Thompson.
2012-01-26 21:16:36 +02:00
Petri Lehtinen
fa268b5017
Add json_object_update_{existing,missing}
...
Closes #37 .
2012-01-24 21:03:36 +02:00
Petri Lehtinen
a307974731
Implement json_object_foreach()
...
Also change many places to use it internally to replace hand-crafted
iteration.
Closes #45 , #46 .
2012-01-24 21:01:24 +02:00
