diff options
author | Bob Weinand <bobwei9@hotmail.com> | 2014-02-06 09:38:50 +0100 |
---|---|---|
committer | Bob Weinand <bobwei9@hotmail.com> | 2014-02-06 09:38:50 +0100 |
commit | 45d2df5f119d17804ccf6068cbe1132e118579b2 (patch) | |
tree | e3014245763e4290de480fad0b1142728314b965 /Zend/zend_extensions.h | |
parent | b33060af82c648bb3971de9d8fe67e52781cbd7a (diff) | |
parent | e5ded6e843fc43dde4b6c65405a1d3e2ae026eb4 (diff) | |
download | php-git-broken-5.6-20140206.tar.gz |
Merge branch 'datibbaw/pow-operator' into PHP-5.6broken-5.6-20140206
Diffstat (limited to 'Zend/zend_extensions.h')
-rw-r--r-- | Zend/zend_extensions.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h index 3eda38aa96..38ac9f8947 100644 --- a/Zend/zend_extensions.h +++ b/Zend/zend_extensions.h @@ -28,7 +28,7 @@ /* The first number is the engine version and the rest is the date. * This way engine 2/3 API no. is always greater than engine 1 API no.. */ -#define ZEND_EXTENSION_API_NO 220131226 +#define ZEND_EXTENSION_API_NO 220131227 typedef struct _zend_extension_version_info { int zend_extension_api_no; @@ -94,7 +94,7 @@ struct _zend_extension { BEGIN_EXTERN_C() ZEND_API int zend_get_resource_handle(zend_extension *extension); -ZEND_API void zend_extension_dispatch_message(int message, void *arg); +ZEND_API void zend_extension_dispatch_message(int message, void *arg TSRMLS_DC); END_EXTERN_C() #define ZEND_EXTMSG_NEW_EXTENSION 1 @@ -117,8 +117,8 @@ int zend_startup_extensions(void); void zend_shutdown_extensions(TSRMLS_D); BEGIN_EXTERN_C() -ZEND_API int zend_load_extension(const char *path); -ZEND_API int zend_register_extension(zend_extension *new_extension, DL_HANDLE handle); +ZEND_API int zend_load_extension(const char *path TSRMLS_DC); +ZEND_API int zend_register_extension(zend_extension *new_extension, DL_HANDLE handle TSRMLS_DC); ZEND_API zend_extension *zend_get_extension(const char *extension_name); END_EXTERN_C() |