Commit: ded889e865825b41e9484a47bfbcbd4b6ed15d50 Author: Pierrick Charron <pierr...@php.net> Sun, 23 Dec 2012 14:05:04 -0500 Parents: ee453541ed5b7d1dc3dd96e3a9af4bfc9ae75956 Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ded889e865825b41e9484a47bfbcbd4b6ed15d50 Log: Remove duplicated function definition Changed paths: M ext/curl/php_curl.h Diff: diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index 0a272fa..02eb24e 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -59,35 +59,29 @@ extern int le_curl_share_handle; PHP_MINIT_FUNCTION(curl); PHP_MSHUTDOWN_FUNCTION(curl); PHP_MINFO_FUNCTION(curl); -PHP_FUNCTION(curl_version); -PHP_FUNCTION(curl_init); + +PHP_FUNCTION(curl_close); PHP_FUNCTION(curl_copy_handle); -PHP_FUNCTION(curl_setopt); -PHP_FUNCTION(curl_setopt_array); +PHP_FUNCTION(curl_errno); +PHP_FUNCTION(curl_error); PHP_FUNCTION(curl_exec); PHP_FUNCTION(curl_getinfo); -PHP_FUNCTION(curl_error); -PHP_FUNCTION(curl_errno); -PHP_FUNCTION(curl_close); - -#if LIBCURL_VERSION_NUM >= 0x070c01 /* 7.12.1 */ -PHP_FUNCTION(curl_reset); -#endif -#if LIBCURL_VERSION_NUM > 0x070f03 /* 7.15.4 */ -PHP_FUNCTION(curl_escape); -PHP_FUNCTION(curl_unescape); -#endif +PHP_FUNCTION(curl_init); +PHP_FUNCTION(curl_setopt); +PHP_FUNCTION(curl_setopt_array); +PHP_FUNCTION(curl_version); -PHP_FUNCTION(curl_multi_init); PHP_FUNCTION(curl_multi_add_handle); -PHP_FUNCTION(curl_multi_remove_handle); -PHP_FUNCTION(curl_multi_select); +PHP_FUNCTION(curl_multi_close); PHP_FUNCTION(curl_multi_exec); PHP_FUNCTION(curl_multi_getcontent); PHP_FUNCTION(curl_multi_info_read); -PHP_FUNCTION(curl_multi_close); -PHP_FUNCTION(curl_share_init); +PHP_FUNCTION(curl_multi_init); +PHP_FUNCTION(curl_multi_remove_handle); +PHP_FUNCTION(curl_multi_select); + PHP_FUNCTION(curl_share_close); +PHP_FUNCTION(curl_share_init); PHP_FUNCTION(curl_share_setopt); #if LIBCURL_VERSION_NUM >= 0x070c01 /* 7.12.1 */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
