diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /Zend/zend_modules.h | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'Zend/zend_modules.h')
| -rw-r--r-- | Zend/zend_modules.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h index 0cd9ca4d16..96f1e7598f 100644 --- a/Zend/zend_modules.h +++ b/Zend/zend_modules.h @@ -26,14 +26,14 @@ #include "zend_compile.h" #include "zend_build.h" -#define INIT_FUNC_ARGS int type, int module_number TSRMLS_DC -#define INIT_FUNC_ARGS_PASSTHRU type, module_number TSRMLS_CC -#define SHUTDOWN_FUNC_ARGS int type, int module_number TSRMLS_DC -#define SHUTDOWN_FUNC_ARGS_PASSTHRU type, module_number TSRMLS_CC -#define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module TSRMLS_DC -#define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module TSRMLS_CC - -#define ZEND_MODULE_API_NO 20140815 +#define INIT_FUNC_ARGS int type, int module_number +#define INIT_FUNC_ARGS_PASSTHRU type, module_number +#define SHUTDOWN_FUNC_ARGS int type, int module_number +#define SHUTDOWN_FUNC_ARGS_PASSTHRU type, module_number +#define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module +#define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module + +#define ZEND_MODULE_API_NO 20141001 #ifdef ZTS #define USING_ZTS 1 #else @@ -91,8 +91,8 @@ struct _zend_module_entry { #else void* globals_ptr; #endif - void (*globals_ctor)(void *global TSRMLS_DC); - void (*globals_dtor)(void *global TSRMLS_DC); + void (*globals_ctor)(void *global); + void (*globals_dtor)(void *global); int (*post_deactivate_func)(void); int module_started; unsigned char type; @@ -125,8 +125,8 @@ struct _zend_module_dep { extern ZEND_API HashTable module_registry; void module_destructor(zend_module_entry *module); -int module_registry_request_startup(zend_module_entry *module TSRMLS_DC); -int module_registry_unload_temp(const zend_module_entry *module TSRMLS_DC); +int module_registry_request_startup(zend_module_entry *module); +int module_registry_unload_temp(const zend_module_entry *module); #endif |