edink Thu Jun 19 19:07:14 2003 EDT
Modified files:
/php4/ext/curl interface.c php_curl.h streams.c
Log:
Win32 build fixes
Index: php4/ext/curl/interface.c
diff -u php4/ext/curl/interface.c:1.22 php4/ext/curl/interface.c:1.23
--- php4/ext/curl/interface.c:1.22 Thu Jun 19 18:12:21 2003
+++ php4/ext/curl/interface.c Thu Jun 19 19:07:14 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.22 2003/06/19 22:12:21 iliaa Exp $ */
+/* $Id: interface.c,v 1.23 2003/06/19 23:07:14 edink Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -55,6 +55,8 @@
#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 @@
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)
Index: php4/ext/curl/php_curl.h
diff -u php4/ext/curl/php_curl.h:1.34 php4/ext/curl/php_curl.h:1.35
--- php4/ext/curl/php_curl.h:1.34 Tue Jun 10 16:03:26 2003
+++ php4/ext/curl/php_curl.h Thu Jun 19 19:07:14 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_curl.h,v 1.34 2003/06/10 20:03:26 imajes Exp $ */
+/* $Id: php_curl.h,v 1.35 2003/06/19 23:07:14 edink Exp $ */
#ifndef _PHP_CURL_H
#define _PHP_CURL_H
@@ -131,10 +131,10 @@
/* 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;
Index: php4/ext/curl/streams.c
diff -u php4/ext/curl/streams.c:1.7 php4/ext/curl/streams.c:1.8
--- php4/ext/curl/streams.c:1.7 Tue Jun 10 16:03:26 2003
+++ php4/ext/curl/streams.c Thu Jun 19 19:07:14 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.7 2003/06/10 20:03:26 imajes Exp $ */
+/* $Id: streams.c,v 1.8 2003/06/19 23:07:14 edink Exp $ */
/* This file implements cURL based wrappers.
* NOTE: If you are implementing your own streams that are intended to
@@ -232,7 +232,7 @@
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 *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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
