com php-src: remove #ifdef: ext/curl/interface.c
| From: | Anatol Belski | Date: | Mon, 13 Jul 2015 22:12:35 +0000 |
| Subject: | com php-src: remove #ifdef: ext/curl/interface.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87972@lists.php.net to get a copy of this message | ||
Commit: 9db46a392ba555b362378b21595cce5bf3e98fc0
Author: Anatol Belski <ab@php.net> Tue, 14 Jul 2015 00:12:35 +0200
Parents: b19aea374217c916f38498059390aaab69c6a5a5
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9db46a392ba555b362378b21595cce5bf3e98fc0
Log:
remove #ifdef
Changed paths:
M ext/curl/interface.c
Diff:
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 66dbb4e..3ac1307 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -2904,11 +2904,11 @@ PHP_FUNCTION(curl_getinfo)
if (ZEND_NUM_ARGS() < 2) {
char *s_code;
-#ifdef PHP_WIN32
+ /* libcurl expects long datatype. So far no cases are known where
+ it would be an issue. Using zend_long would truncate a 64-bit
+ var on Win64, so the exact long datatype fits everywhere, as
+ long as there's no 32-bit int overflow. */
long l_code;
-#else
- zend_long l_code;
-#endif
double d_code;
#if LIBCURL_VERSION_NUM > 0x071301
struct curl_certinfo *ci = NULL;