* Make headers C++ compatible by change *this to *obj
* Add ifdef C++ extern "C" to headers
* Use simpler definition of min and max in bits.h
Larry Lansing, llansing at fuzzynerd dot com
* Remove automake 1.6 requirement
* Move autogen commands into autogen.sh. Update README
* Remove error pointer special case for Windows
* Change license from LGPL to MIT
Michael Clark <michael@metaparadigm.com>
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@10 327403b1-1117-474d-bef2-5cb71233fd97
diff --git a/json_tokener.h b/json_tokener.h
index 9bdf238..f36c058 100644
--- a/json_tokener.h
+++ b/json_tokener.h
@@ -1,18 +1,11 @@
/*
- * $Id: json_tokener.h,v 1.6 2005/06/14 22:41:51 mclark Exp $
+ * $Id: json_tokener.h,v 1.8 2006/01/26 02:16:28 mclark Exp $
*
- * Copyright Metaparadigm Pte. Ltd. 2004.
+ * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd.
* Michael Clark <michael@metaparadigm.com>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public (LGPL)
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details: http://www.gnu.org/
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See COPYING for details.
*
*/
@@ -32,7 +25,7 @@
json_tokener_error_parse_object,
json_tokener_error_parse_string,
json_tokener_error_parse_comment,
- json_tokener_error_parse_eof,
+ json_tokener_error_parse_eof
};
enum json_tokener_state {
@@ -56,7 +49,7 @@
json_tokener_state_object_field,
json_tokener_state_object_field_end,
json_tokener_state_object_value,
- json_tokener_state_object_sep,
+ json_tokener_state_object_sep
};
struct json_tokener