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 /ext/curl/php_curl.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 'ext/curl/php_curl.h')
| -rw-r--r-- | ext/curl/php_curl.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index ad44ae7b96..0adb8b5ae2 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -114,8 +114,8 @@ PHP_FUNCTION(curl_pause); PHP_FUNCTION(curl_file_create); -void _php_curl_multi_close(zend_resource * TSRMLS_DC); -void _php_curl_share_close(zend_resource * TSRMLS_DC); +void _php_curl_multi_close(zend_resource *); +void _php_curl_share_close(zend_resource *); typedef struct { zval func_name; @@ -174,7 +174,6 @@ typedef struct { struct _php_curl_error err; struct _php_curl_free *to_free; struct _php_curl_send_headers header; - void ***thread_ctx; CURL *cp; php_curl_handlers *handlers; zend_resource *res; @@ -197,9 +196,9 @@ typedef struct { void _php_curl_cleanup_handle(php_curl *); void _php_curl_multi_cleanup_list(void *data); -void _php_curl_verify_handlers(php_curl *ch, int reporterror TSRMLS_DC); +void _php_curl_verify_handlers(php_curl *ch, int reporterror); -void curlfile_register_class(TSRMLS_D); +void curlfile_register_class(void); PHP_CURL_API extern zend_class_entry *curl_CURLFile_class; #else |