diff options
| author | Petri Lehtinen <petri@digip.org> | 2014-02-11 14:49:15 +0200 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2014-02-11 14:49:15 +0200 |
| commit | 17ec22f514ceb9277bea1e38cc8ea69eec1edd53 (patch) | |
| tree | 55b75defa871dc7178a0f2c6cead32b2bd69b8f5 /src/jansson.h | |
| parent | a721d36f4143faa94c78e447515994891ce9c30f (diff) | |
| parent | e83ded066a610f8de7caaa3942769321ededa84f (diff) | |
| download | jansson-17ec22f514ceb9277bea1e38cc8ea69eec1edd53.zip jansson-17ec22f514ceb9277bea1e38cc8ea69eec1edd53.tar.gz jansson-17ec22f514ceb9277bea1e38cc8ea69eec1edd53.tar.bz2 | |
Merge branch '2.6'
Diffstat (limited to 'src/jansson.h')
| -rw-r--r-- | src/jansson.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/jansson.h b/src/jansson.h index c923a90..85215f4 100644 --- a/src/jansson.h +++ b/src/jansson.h @@ -21,11 +21,11 @@ extern "C" { /* version */ #define JANSSON_MAJOR_VERSION 2 -#define JANSSON_MINOR_VERSION 5 +#define JANSSON_MINOR_VERSION 6 #define JANSSON_MICRO_VERSION 0 /* Micro version is omitted if it's 0 */ -#define JANSSON_VERSION "2.5" +#define JANSSON_VERSION "2.6" /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */ @@ -129,6 +129,7 @@ typedef struct { /* getters, setters, manipulation */ +void json_object_seed(size_t seed); size_t json_object_size(const json_t *object); json_t *json_object_get(const json_t *object, const char *key); int json_object_set_new(json_t *object, const char *key, json_t *value); |