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

jansson 2.10

Browse Source
This commit is contained in:
Nathaniel McCallum 2017-03-02 08:50:20 -05:00 committed by Petri Lehtinen
parent df454e3cf0
commit b23201bb1a
6 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
CHANGES
View File

@ -1,3 +1,28 @@
Version 2.10
============
Released 2017-03-02
* New features:
- Add JSON_EMBED encoding flag allowing arrays and objects to be encoded
into existing streams (#329).
- Add `json_dumpb()` function for dumping to a pre-allocated buffer (#328).
- Add `json_dumpfd()` and `json_loadfd()` functions for dumping to streaming
file descriptors (#328).
- Add support for parsing buffers larger than 2GB (#309).
* Build:
- Fix CMake build when LONG_LONG_INT is defined as "" (#321)
* Other:
- Internal code cleanup (#311, #314)
Version 2.9 Version 2.9
=========== ===========

4
CMakeLists.txt
View File

@ -86,10 +86,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.9") set(JANSSON_DISPLAY_VERSION "2.10")
# 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.9.0") set(JANSSON_VERSION "4.10.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.9], [petri@digip.org]) AC_INIT([jansson], [2.10], [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/conf.py
View File

@ -48,7 +48,7 @@ copyright = u'2009-2016, Petri Lehtinen'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '2.10-dev' version = '2.10'
# 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

@ -24,4 +24,4 @@ libjansson_la_SOURCES = \
libjansson_la_LDFLAGS = \ libjansson_la_LDFLAGS = \
-no-undefined \ -no-undefined \
-export-symbols-regex '^json_' \ -export-symbols-regex '^json_' \
-version-info 13:0:9 -version-info 14:0:10

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 9 #define JANSSON_MINOR_VERSION 10
#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.9" #define JANSSON_VERSION "2.10"
/* 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 >= ... */