diff options
| author | Petri Lehtinen <petri@digip.org> | 2014-10-02 09:01:51 +0300 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2014-10-02 13:10:45 +0300 |
| commit | ee27b7e3ddf6853a698af163c8e0627fa295091b (patch) | |
| tree | 2c2b6fed789675a4b100ab6c66adcf573828c6a7 | |
| parent | 391d9101a8d32b083bef9c76f53a603800e3e09f (diff) | |
| download | jansson-ee27b7e3ddf6853a698af163c8e0627fa295091b.zip jansson-ee27b7e3ddf6853a698af163c8e0627fa295091b.tar.gz jansson-ee27b7e3ddf6853a698af163c8e0627fa295091b.tar.bz2 | |
jansson 2.7v2.7
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/apiref.rst | 2 | ||||
| -rw-r--r-- | doc/conf.py | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/jansson.h | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1827da4..d8a78c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,10 +78,10 @@ endif (WIN32) # set (JANSSON_VERSION "2.3.1") # set (JANSSON_SOVERSION 2) -set(JANSSON_DISPLAY_VERSION "2.6") +set(JANSSON_DISPLAY_VERSION "2.7") # This is what is required to match the same numbers as automake's -set(JANSSON_VERSION "4.6.0") +set(JANSSON_VERSION "4.7.0") set(JANSSON_SOVERSION 4) # for CheckFunctionKeywords diff --git a/configure.ac b/configure.ac index c8b5284..433b499 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([jansson], [2.6], [petri@digip.org]) +AC_INIT([jansson], [2.7], [petri@digip.org]) AC_CONFIG_AUX_DIR([.]) AM_INIT_AUTOMAKE([1.10 foreign]) diff --git a/doc/apiref.rst b/doc/apiref.rst index 35d98d2..b60a521 100644 --- a/doc/apiref.rst +++ b/doc/apiref.rst @@ -1313,7 +1313,7 @@ type whose address should be passed. :func:`json_string_value()` internally, so it exists as long as there are still references to the corresponding JSON string. -``s%`` (string) [const char \*, size_t *] +``s%`` (string) [const char \*, size_t \*] Convert a JSON string to a pointer to a NULL terminated UTF-8 string and its length. diff --git a/doc/conf.py b/doc/conf.py index a9adf9f..e7ad405 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -48,7 +48,7 @@ copyright = u'2009-2014, Petri Lehtinen' # built documents. # # The short X.Y version. -version = '2.6' +version = '2.7' # The full version, including alpha/beta/rc tags. release = version diff --git a/src/Makefile.am b/src/Makefile.am index 489a957..b5db968 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,4 +23,4 @@ libjansson_la_SOURCES = \ libjansson_la_LDFLAGS = \ -no-undefined \ -export-symbols-regex '^json_' \ - -version-info 10:0:6 + -version-info 11:0:7 diff --git a/src/jansson.h b/src/jansson.h index 80ab05f..b06ab9c 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 6 +#define JANSSON_MINOR_VERSION 7 #define JANSSON_MICRO_VERSION 0 /* Micro version is omitted if it's 0 */ -#define JANSSON_VERSION "2.6" +#define JANSSON_VERSION "2.7" /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */ |