diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 19:39:21 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 19:39:21 -0400 |
| commit | 6821b67124604da690c5e9276d5370d679c63ac8 (patch) | |
| tree | befb4ca2520eb577950cef6cb76d10b914cbf67a /ext/json/php_json.h | |
| parent | cd0b49c72aee33b3e44a9c589fcd93b9e1c7a64f (diff) | |
| download | php-6821b67124604da690c5e9276d5370d679c63ac8.tar.gz | |
Imported Upstream version 5.3.0RC1upstream/5.3.0_RC1upstream/5.3.0RC1
Diffstat (limited to 'ext/json/php_json.h')
| -rw-r--r-- | ext/json/php_json.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/ext/json/php_json.h b/ext/json/php_json.h index 13aab3c62..dc51d9b4a 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_json.h,v 1.8.2.4 2008/12/31 11:17:38 sebastian Exp $ */ +/* $Id: php_json.h,v 1.8.2.2.2.5 2008/12/31 11:15:38 sebastian Exp $ */ #ifndef PHP_JSON_H #define PHP_JSON_H @@ -26,25 +26,22 @@ extern zend_module_entry json_module_entry; #define phpext_json_ptr &json_module_entry -#ifdef PHP_WIN32 -#define PHP_JSON_API __declspec(dllexport) -#else -#define PHP_JSON_API -#endif - #ifdef ZTS #include "TSRM.h" #endif +ZEND_BEGIN_MODULE_GLOBALS(json) + int error_code; +ZEND_END_MODULE_GLOBALS(json) + #ifdef ZTS -#define JSON_G(v) TSRMG(json_globals_id, zend_json_globals *, v) +# define JSON_G(v) TSRMG(json_globals_id, zend_json_globals *, v) #else -#define JSON_G(v) (json_globals.v) +# define JSON_G(v) (json_globals.v) #endif #endif /* PHP_JSON_H */ - /* * Local variables: * tab-width: 4 |