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_extensions.c | |
| 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_extensions.c')
| -rw-r--r-- | Zend/zend_extensions.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c index 04150920af..365a902171 100644 --- a/Zend/zend_extensions.c +++ b/Zend/zend_extensions.c @@ -24,7 +24,7 @@ ZEND_API zend_llist zend_extensions; static int last_resource_number; -int zend_load_extension(const char *path TSRMLS_DC) +int zend_load_extension(const char *path) { #if ZEND_EXTENSIONS_SUPPORT DL_HANDLE handle; @@ -115,7 +115,7 @@ int zend_load_extension(const char *path TSRMLS_DC) return FAILURE; } - return zend_register_extension(new_extension, handle TSRMLS_CC); + return zend_register_extension(new_extension, handle); #else fprintf(stderr, "Extensions are not supported on this platform.\n"); /* See http://support.microsoft.com/kb/190351 */ @@ -127,7 +127,7 @@ int zend_load_extension(const char *path TSRMLS_DC) } -int zend_register_extension(zend_extension *new_extension, DL_HANDLE handle TSRMLS_DC) +int zend_register_extension(zend_extension *new_extension, DL_HANDLE handle) { #if ZEND_EXTENSIONS_SUPPORT zend_extension extension; @@ -135,7 +135,7 @@ int zend_register_extension(zend_extension *new_extension, DL_HANDLE handle TSRM extension = *new_extension; extension.handle = handle; - zend_extension_dispatch_message(ZEND_EXTMSG_NEW_EXTENSION, &extension TSRMLS_CC); + zend_extension_dispatch_message(ZEND_EXTMSG_NEW_EXTENSION, &extension); zend_llist_add_element(&zend_extensions, &extension); @@ -146,7 +146,7 @@ int zend_register_extension(zend_extension *new_extension, DL_HANDLE handle TSRM } -static void zend_extension_shutdown(zend_extension *extension TSRMLS_DC) +static void zend_extension_shutdown(zend_extension *extension) { #if ZEND_EXTENSIONS_SUPPORT if (extension->shutdown) { @@ -185,9 +185,9 @@ int zend_startup_extensions() } -void zend_shutdown_extensions(TSRMLS_D) +void zend_shutdown_extensions(void) { - zend_llist_apply(&zend_extensions, (llist_apply_func_t) zend_extension_shutdown TSRMLS_CC); + zend_llist_apply(&zend_extensions, (llist_apply_func_t) zend_extension_shutdown); zend_llist_destroy(&zend_extensions); } @@ -202,7 +202,7 @@ void zend_extension_dtor(zend_extension *extension) } -static void zend_extension_message_dispatcher(const zend_extension *extension, int num_args, va_list args TSRMLS_DC) +static void zend_extension_message_dispatcher(const zend_extension *extension, int num_args, va_list args) { int message; void *arg; @@ -216,9 +216,9 @@ static void zend_extension_message_dispatcher(const zend_extension *extension, i } -ZEND_API void zend_extension_dispatch_message(int message, void *arg TSRMLS_DC) +ZEND_API void zend_extension_dispatch_message(int message, void *arg) { - zend_llist_apply_with_arguments(&zend_extensions, (llist_apply_with_args_func_t) zend_extension_message_dispatcher TSRMLS_CC, 2, message, arg); + zend_llist_apply_with_arguments(&zend_extensions, (llist_apply_with_args_func_t) zend_extension_message_dispatcher, 2, message, arg); } |