diff options
| -rw-r--r-- | Zend/zend_execute_API.c | 6 | ||||
| -rw-r--r-- | ext/curl/interface.c | 2 | ||||
| -rw-r--r-- | ext/curl/php_curl.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 18b3388ab8..9131f1d57b 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -33,15 +33,15 @@ #include <sys/time.h> #endif - ZEND_API void (*zend_execute)(zend_op_array *op_array TSRMLS_DC); ZEND_API void (*zend_execute_internal)(zend_execute_data *execute_data_ptr, int return_value_used TSRMLS_DC); -#ifdef ZEND_WIN32 -#include <process.h> /* true global */ ZEND_API zend_fcall_info_cache empty_fcall_info_cache = { NULL, NULL, NULL, 0 }; +#ifdef ZEND_WIN32 +#include <process.h> + static WNDCLASS wc; static HWND timeout_window; static HANDLE timeout_thread_event; diff --git a/ext/curl/interface.c b/ext/curl/interface.c index feec10b1ff..c549ea2983 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -562,7 +562,7 @@ static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx fci.params = argv; fci.no_separation = 0; - error = zend_call_user_function(&fci, &t->fci_cache TSRMLS_CC); + error = zend_call_function(&fci, &t->fci_cache TSRMLS_CC); if (error == FAILURE) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not call the CURLOPT_HEADERFUNCTION"); length = -1; diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index 46d5509a50..94c94e971e 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -79,7 +79,7 @@ void _php_curl_multi_close(zend_rsrc_list_entry * TSRMLS_DC); typedef struct { zval *func_name; - zend_fcall_info fci_cache; + zend_fcall_info_cache fci_cache; FILE *fp; smart_str buf; int method; @@ -88,7 +88,7 @@ typedef struct { typedef struct { zval *func_name; - zend_fcall_info fci_cache; + zend_fcall_info_cache fci_cache; FILE *fp; long fd; int method; |