Win32 build fixes

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 54216e00707926b3cae0c0878476adb2257cd020..d907733fd4890b6e29678c836174d4e911f4f7e1 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -55,6 +55,8 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC);
 #define CAAS(s, v) add_assoc_string_ex(return_value, s, sizeof(s), (char *) v, 1);
 #define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v);
 
+static const unsigned char second_args_force_ref[]    = { 2, BYREF_NONE, BYREF_FORCE };
+
 /* {{{ curl_functions[]
  */
 function_entry curl_functions[] = {
@@ -70,7 +72,7 @@ function_entry curl_functions[] = {
        PHP_FE(curl_multi_add_handle,    NULL)
        PHP_FE(curl_multi_remove_handle, NULL)
        PHP_FE(curl_multi_select,        NULL)
-       PHP_FE(curl_multi_exec,          second_arg_force_ref)
+       PHP_FE(curl_multi_exec,          second_args_force_ref)
        PHP_FE(curl_multi_getcontent,    NULL)
        PHP_FE(curl_multi_info_read,     NULL)
        PHP_FE(curl_multi_close,         NULL)

diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h
index 4bdcb79c891933f3dcf9ef90329f03617436ac46..76c91ec1dda034ef5b68b74e12171b9fbcea82b4 100644 (file)
--- a/ext/curl/php_curl.h
+++ b/ext/curl/php_curl.h
@@ -131,10 +131,10 @@ void _php_curl_cleanup_handle(php_curl *);
 
 /* streams support */
 
-PHPAPI extern php_stream_ops php_curl_stream_ops;
+extern php_stream_ops php_curl_stream_ops;
 #define PHP_STREAM_IS_CURL     &php_curl_stream_ops
 
-PHPAPI php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char *filename, char *mode,
+php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char *filename, char *mode,
                int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC);
 
 extern php_stream_wrapper php_curl_wrapper;

diff --git a/ext/curl/streams.c b/ext/curl/streams.c
index cec4cf21de35cd29bb85d49f23526a09b757bd4d..88b8df609a959f05bb1cdbc223ae28ececfbda48 100644 (file)
--- a/ext/curl/streams.c
+++ b/ext/curl/streams.c
@@ -232,7 +232,7 @@ static int php_curl_stream_cast(php_stream *stream, int castas, void **ret TSRML
        return php_stream_cast(curlstream->readbuffer.buf, castas, ret, 0);
 }
 
-PHPAPI php_stream_ops php_curl_stream_ops = {
+php_stream_ops php_curl_stream_ops = {
        php_curl_stream_write,
        php_curl_stream_read,
        php_curl_stream_close,
@@ -244,7 +244,7 @@ PHPAPI php_stream_ops php_curl_stream_ops = {
 };
 
 
-PHPAPI php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char *filename, char *mode,
+php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char *filename, char *mode,
                int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC)
 {
        php_stream *stream;