diff options
author | Michael Clark <michael@metaparadigm.com> | 2007-03-13 08:26:20 +0000 |
---|---|---|
committer | Michael Clark <michael@metaparadigm.com> | 2007-03-13 08:26:20 +0000 |
commit | 4504df71178fe7a0eb8e7c37fa548b7c853a800f (patch) | |
tree | b5c804143276475f469429ad2f7e6c7de9584743 /json_tokener.h | |
parent | f0d08887b857fce1fe95a68d29eb7a07cd527d7c (diff) | |
download | json-c-4504df71178fe7a0eb8e7c37fa548b7c853a800f.tar.gz |
* 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
Diffstat (limited to 'json_tokener.h')
-rw-r--r-- | json_tokener.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/json_tokener.h b/json_tokener.h index c39577d..9bdf238 100644 --- a/json_tokener.h +++ b/json_tokener.h @@ -1,5 +1,5 @@ /* - * $Id: json_tokener.h,v 1.5 2004/07/22 01:20:05 mclark Exp $ + * $Id: json_tokener.h,v 1.6 2005/06/14 22:41:51 mclark Exp $ * * Copyright Metaparadigm Pte. Ltd. 2004. * Michael Clark <michael@metaparadigm.com> @@ -19,6 +19,7 @@ #ifndef _json_tokener_h_ #define _json_tokener_h_ +#include "config.h" #include "json_object.h" enum json_tokener_error { @@ -65,6 +66,17 @@ struct json_tokener struct printbuf *pb; }; +#if !HAVE_STRNCASECMP && defined(_MSC_VER) + /* MSC has the version as _strnicmp */ +# define strncasecmp _strnicmp +#elif !HAVE_STRNCASECMP +# error You do not have strncasecmp on your system. +#endif /* HAVE_STRNCASECMP */ + +#if !HAVE_STRNDUP + char* strndup(const char* str, size_t n); +#endif /* !HAVE_STRNDUP */ + extern struct json_object* json_tokener_parse(char *s); #endif |