Commit Graph

24 Commits

Author SHA1 Message Date
Eric Haszlakiewicz
4207147c24 Bump the versions for the non-release branch; add a placeholder section to the change log. 2013-04-02 21:22:59 -05:00
Thomas Gstädtner
36ec47db49 configure.in: mv AM_CONFIG_HEADER to AC_CONFIG_HEADER
the former has been deprecated and does not work on newer autoconf
versions.
2013-03-03 00:36:32 +01:00
Eric Haszlakiewicz
5b36a432c8 Merge branch 'remicollet-issue-float'
Conflicts:
	json_util.c
2013-02-26 21:09:10 -06:00
Eric Haszlakiewicz
fcc768e667 Bump the version up to 0.10.99 to make it clear that the master branch is beyond anything on the 0.10 branch. 2012-12-23 11:09:20 -06:00
Remi Collet
16a4a32e29 float parsing must be locale independent 2012-11-27 11:06:49 +01:00
Lin Xu
e7e0600405 Add an autoconf test to test whether the .section .gnu<warning>
works with the linker on the system, and define _warn_references
to nothing if not.
2012-09-09 17:36:30 -07:00
Eric Haszlakiewicz
1f9d199522 Re-add the "json" pkg-config file as a compatibility shim.
Also rename the json-c-uninstalled.pc file.
2012-07-29 18:25:09 -05:00
Eric Haszlakiewicz
075b783631 Add a --disable-oldname-compat option to configure to turn off the creation of the libjson.so library, and only include libjson-c.so 2012-07-29 17:48:22 -05:00
Eric Haszlakiewicz
eb37094aa6 Check for the sys/cdefs.h header which on some systems defines the __warn_references macro. 2012-07-29 14:57:59 -05:00
Eric Haszlakiewicz
c2d3ccf3af Merge branch 'rename_library' of https://github.com/kdopen/json-c into kdopen-rename_library
Conflicts:
	.gitignore
	Makefile.am
	configure.in
	printbuf.c
	test1.c
	test1.expected
2012-07-29 14:06:52 -05:00
Eric Haszlakiewicz
381f77c5bc Merge pull request #26 from ford-prefect/master
Android build system
2012-07-08 19:01:19 -07:00
Mateusz Loskot
984303dfe5 Added a bunch of missing HAVE_* defines tested with ./configure script to fix compilation on Linux with GCC 4.7.1. The issue likely caused by my previous commits related to Visual C++ port of the code. 2012-06-19 20:15:44 +01:00
Arun Raghavan
cb29a77c94 Add a pkgconfig file for uninstalled builds
This allows systems certain types of build setups to work. Specifically, this
will help when building on Android and using json-c as a dependency for another
package.
2012-04-26 13:18:33 +05:30
Eric Haszlakiewicz
1e89ba68af Create a tests subdirectory and move one of the test to there. 2012-04-22 10:27:50 -05:00
Keith Derrick
30dd367c0a Modify install names for library and include files
Changing root name of library to json-c, and also the
directory where header files are installed to .../jsdon-c/*.

This avoids clashes with other implementations of JSON libraries.
2012-04-05 19:38:02 -07:00
Eric Haszlakiewicz
2b5929bb13 Direct people to send bug reports to the json-c google group. 2012-04-02 07:53:25 -07:00
Eric Haszlakiewicz
781798ccdf Direct people to send bug reports to the json-c google group. 2012-03-31 23:17:31 -05:00
Eric Haszlakiewicz
b21b137805 Include json_inttypes.h in json_object.h since we use types like int32_t in the API and some systems need that header to compile.
As part of this create a public json_config.h with a custom define to
decide whether to include inttypes.h to avoid conflicting with other
projects config.h header.
2012-02-15 20:47:11 -06:00
Eric Haszlakiewicz
0354e19c31 Bump the version to 0.10, since that's what we were at.
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@69 327403b1-1117-474d-bef2-5cb71233fd97
2011-05-03 21:09:30 +00:00
Michael Clark
68cafad078 Add const correctness to public interfaces
Gerard Krol, g dot c dot krol at student dot tudelft dot nl

Update version number to 0.9



git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@27 327403b1-1117-474d-bef2-5cb71233fd97
2009-01-06 22:56:57 +00:00
Michael Clark
80a6007009 changes to make 'make dist' work properly
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@24 327403b1-1117-474d-bef2-5cb71233fd97
2009-01-05 06:55:02 +00:00
Michael Clark
a0d35c7ebf change version to 0.8
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@22 327403b1-1117-474d-bef2-5cb71233fd97
2008-08-08 06:54:28 +00:00
Michael Clark
7b899b6dc5 * fix pointer arithmetic bug for error pointer check in is_error() macro
* fix type passed to printbuf_memappend in json_tokener
  * update autotools bootstrap instructions in README
    Michael Clark <michael@metaparadigm.com>


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@6 327403b1-1117-474d-bef2-5cb71233fd97
2007-03-13 08:26:21 +00:00
Michael Clark
4504df7117 * printbuf.c - C. Watford (christopher dot watford at gmail dot com)
Added a Win32/Win64 compliant implementation of vasprintf
  * debug.c - C. Watford (christopher dot watford at gmail dot com)
    Removed usage of vsyslog on Win32/Win64 systems, needs to be handled
    by a configure script
  * json_object.c - C. Watford (christopher dot watford at gmail dot com)
    Added scope operator to wrap usage of json_object_object_foreach, this
    needs to be rethought to be more ANSI C friendly
  * json_object.h - C. Watford (christopher dot watford at gmail dot com)
    Added Microsoft C friendly version of json_object_object_foreach
  * json_tokener.c - C. Watford (christopher dot watford at gmail dot com)
    Added a Win32/Win64 compliant implementation of strndup
  * json_util.c - C. Watford (christopher dot watford at gmail dot com)
    Added cast and mask to suffice size_t v. unsigned int conversion
    correctness
  * json_tokener.c - sign reversal issue on error info for nested object parse
    spotted by Johan Bj�rklund (johbjo09 at kth.se)
  * json_object.c - escape " in json_escape_str
  * Change to automake and libtool to build shared and static library
    Michael Clark <michael@metaparadigm.com>


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@4 327403b1-1117-474d-bef2-5cb71233fd97
2007-03-13 08:26:20 +00:00