From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 18 Jul 2019 12:42:20 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0beta1~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be7f405f6bf3b4532f844fe9aeb92aea9f9ca02c;p=php

Merge branch 'PHP-7.3' into PHP-7.4
---

be7f405f6bf3b4532f844fe9aeb92aea9f9ca02c
diff --cc ext/curl/interface.c
index bc3bf0db49,99e5deb758..6b42ddafa6
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@@ -97,9 -112,44 +97,6 @@@ static ZEND_ATTRIBUTE_UNUSED unsigned l
  static void _php_curl_close_ex(php_curl *ch);
  static void _php_curl_close(zend_resource *rsrc);
  
- #define SAVE_CURL_ERROR(__handle, __err) \
-     do { (__handle)->err.no = (int) __err; } while (0)
--
  #define CAAL(s, v) add_assoc_long_ex(return_value, s, sizeof(s) - 1, (zend_long) v);
  #define CAAD(s, v) add_assoc_double_ex(return_value, s, sizeof(s) - 1, (double) v);
  #define CAAS(s, v) add_assoc_string_ex(return_value, s, sizeof(s) - 1, (char *) (v ? v : ""));
diff --cc ext/curl/php_curl.h
index 359d6058ef,0a0da5aa02..5d93f16c03
--- a/ext/curl/php_curl.h
+++ b/ext/curl/php_curl.h
@@@ -58,6 -58,8 +58,9 @@@ extern zend_module_entry curl_module_en
  #define PHP_CURL_RETURN 4
  #define PHP_CURL_IGNORE 7
  
 -#define SAVE_CURL_ERROR(__handle, __err) (__handle)->err.no = (int) __err;
++#define SAVE_CURL_ERROR(__handle, __err) \
++    do { (__handle)->err.no = (int) __err; } while (0)
+ 
  extern int  le_curl;
  #define le_curl_name "cURL handle"
  extern int  le_curl_multi_handle;