Skip to content

Commit

Permalink
jansson 2.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
akheron committed Mar 31, 2011
1 parent eab23f0 commit 1c0a3b2
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 5 deletions.
31 changes: 31 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,34 @@
Version 2.0.1
=============

Released 2011-03-31

* Bug fixes:

- Replace a few `malloc()` and `free()` calls with their
counterparts that support custom memory management.

- Fix object key hashing in json_unpack() strict checking mode.

- Fix the parentheses in JANSSON_VERSION_HEX macro.

- Fix `json_object_size()` return value.

- Fix a few compilation issues.

* Portability:

- Enhance portability of `va_copy()`.

- Test framework portability enhancements.

* Documentation:

- Distribute ``doc/upgrading.rst`` with the source tarball.

- Build documentation in strict mode in ``make distcheck``.


Version 2.0
===========

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
AC_INIT([jansson], [2.0], [[email protected]])
AC_INIT([jansson], [2.0.1], [[email protected]])

AM_INIT_AUTOMAKE([1.10 foreign])

Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
# The short X.Y version.
version = '2.0'
# The full version, including alpha/beta/rc tags.
release = '2.0'
release = '2.0.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ libjansson_la_SOURCES = \
value.c
libjansson_la_LDFLAGS = \
-export-symbols-regex '^json_' \
-version-info 4:0:0
-version-info 4:1:0

if GCC
# These flags are gcc specific
Expand Down
4 changes: 2 additions & 2 deletions src/jansson.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ extern "C" {

#define JANSSON_MAJOR_VERSION 2
#define JANSSON_MINOR_VERSION 0
#define JANSSON_MICRO_VERSION 0
#define JANSSON_MICRO_VERSION 1

/* Micro version is omitted if it's 0 */
#define JANSSON_VERSION "2.0"
#define JANSSON_VERSION "2.0.1"

/* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */
Expand Down

0 comments on commit 1c0a3b2

Please sign in to comment.