diff options
| author | Petri Lehtinen <petri@digip.org> | 2009-11-08 22:01:02 +0200 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2009-11-08 22:01:02 +0200 |
| commit | e0a88d19d1f103c32bbaf4c20a83575413c4bf80 (patch) | |
| tree | 8ae7bd04df1adec1e5f1824f0ba0ecc93054be51 /src | |
| parent | 17d913307e60d1c3e41d01d9a4be81892d610b3f (diff) | |
| parent | 842bc2128b70e5390cacf83a24375cd5c0d0341c (diff) | |
| download | jansson-e0a88d19d1f103c32bbaf4c20a83575413c4bf80.zip jansson-e0a88d19d1f103c32bbaf4c20a83575413c4bf80.tar.gz jansson-e0a88d19d1f103c32bbaf4c20a83575413c4bf80.tar.bz2 | |
Merge branch '1.1'
Conflicts:
configure.ac
doc/conf.py
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/jansson.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 6ca1ce7..9e9ee6c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,6 +13,6 @@ libjansson_la_SOURCES = \ utf.h \ util.h \ value.c -libjansson_la_LDFLAGS = -version-info 1:0:1 +libjansson_la_LDFLAGS = -version-info 1:1:1 AM_CFLAGS = -Wall -Wextra -Werror diff --git a/src/jansson.h b/src/jansson.h index a3a97e0..c8a5a90 100644 --- a/src/jansson.h +++ b/src/jansson.h @@ -9,7 +9,6 @@ #define JANSSON_H #include <stdio.h> -#include <stdint.h> #ifdef __cplusplus extern "C" { |