Merge branch '1.1'

Conflicts: configure.ac doc/conf.py
2009-11-08 22:01:02 +02:00
parent 17d913307e 842bc2128b
commit e0a88d19d1
5 changed files with 12 additions and 4 deletions
--- 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
--- 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" {