summaryrefslogtreecommitdiff
path: root/ext/json/php_json.h
diff options
context:
space:
mode:
authorSean Finney <seanius@debian.org>2009-06-24 22:49:04 +0200
committerSean Finney <seanius@debian.org>2009-06-24 22:49:04 +0200
commit84f4ca9b07fe5b73d840258f4aa7c1eb534c4253 (patch)
tree9829bd578af8a4a8b42b04277f9067e00dc5ad90 /ext/json/php_json.h
parent6821b67124604da690c5e9276d5370d679c63ac8 (diff)
downloadphp-84f4ca9b07fe5b73d840258f4aa7c1eb534c4253.tar.gz
Imported Upstream version 5.3.0~RC4upstream/5.3.0_RC4upstream/5.3.0.RC4
Diffstat (limited to 'ext/json/php_json.h')
-rw-r--r--ext/json/php_json.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/json/php_json.h b/ext/json/php_json.h
index dc51d9b4a..52a8ee527 100644
--- a/ext/json/php_json.h
+++ b/ext/json/php_json.h
@@ -16,12 +16,13 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_json.h,v 1.8.2.2.2.5 2008/12/31 11:15:38 sebastian Exp $ */
+/* $Id: php_json.h,v 1.8.2.2.2.7 2009/05/31 18:55:10 andrei Exp $ */
#ifndef PHP_JSON_H
#define PHP_JSON_H
#define PHP_JSON_VERSION "1.2.1"
+#include "ext/standard/php_smart_str.h"
extern zend_module_entry json_module_entry;
#define phpext_json_ptr &json_module_entry
@@ -40,6 +41,9 @@ ZEND_END_MODULE_GLOBALS(json)
# define JSON_G(v) (json_globals.v)
#endif
+PHPAPI void php_json_encode(smart_str *buf, zval *val, int options TSRMLS_DC);
+PHPAPI void php_json_decode(zval *return_value, char *str, int str_len, zend_bool assoc, long depth TSRMLS_DC);
+
#endif /* PHP_JSON_H */
/*