From: Anatol Belski <ab@php.net>
Date: Mon, 13 Jul 2015 22:12:35 +0000 (+0200)
Subject: remove #ifdef
X-Git-Tag: php-7.1.1RC1~35^2~7^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9db46a392ba555b362378b21595cce5bf3e98fc0;p=php

remove #ifdef
---

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 66dbb4eb17..3ac13074a8 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;