FGCOM/jansson
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jansson 2.7

Browse Source
This commit is contained in:
Petri Lehtinen 2014-10-02 09:01:51 +03:00
parent 391d9101a8
commit ee27b7e3dd
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -78,10 +78,10 @@ endif (WIN32)
# set (JANSSON_VERSION "2.3.1") # set (JANSSON_VERSION "2.3.1")
# set (JANSSON_SOVERSION 2) # 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 # 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) set(JANSSON_SOVERSION 4)
# for CheckFunctionKeywords # for CheckFunctionKeywords

2
configure.ac
View File

@ -1,5 +1,5 @@
AC_PREREQ([2.60]) AC_PREREQ([2.60])
AC_INIT([jansson], [2.6], [petri@digip.org]) AC_INIT([jansson], [2.7], [petri@digip.org])
AC_CONFIG_AUX_DIR([.]) AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE([1.10 foreign]) AM_INIT_AUTOMAKE([1.10 foreign])

2
doc/apiref.rst
View File

@ -1313,7 +1313,7 @@ type whose address should be passed.
:func:`json_string_value()` internally, so it exists as long as :func:`json_string_value()` internally, so it exists as long as
there are still references to the corresponding JSON string. 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 Convert a JSON string to a pointer to a NULL terminated UTF-8
string and its length. string and its length.

2
doc/conf.py
View File

@ -48,7 +48,7 @@ copyright = u'2009-2014, Petri Lehtinen'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '2.6' version = '2.7'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = version release = version

2
src/Makefile.am
View File

@ -23,4 +23,4 @@ libjansson_la_SOURCES = \
libjansson_la_LDFLAGS = \ libjansson_la_LDFLAGS = \
-no-undefined \ -no-undefined \
-export-symbols-regex '^json_' \ -export-symbols-regex '^json_' \
-version-info 10:0:6 -version-info 11:0:7

4
src/jansson.h
View File

@ -21,11 +21,11 @@ extern "C" {
/* version */ /* version */
#define JANSSON_MAJOR_VERSION 2 #define JANSSON_MAJOR_VERSION 2
#define JANSSON_MINOR_VERSION 6 #define JANSSON_MINOR_VERSION 7
#define JANSSON_MICRO_VERSION 0 #define JANSSON_MICRO_VERSION 0
/* Micro version is omitted if it's 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 /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */ for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */