archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.1' into PHP-8.2

Browse source 
* PHP-8.1:
  ext/curl: suppress -Wdeprecated-declarations in curl_arginfo.h
This commit is contained in:
Ilija Tovilo 2023-03-22 20:58:25 +01:00
commit c8f9adb44d
No known key found for this signature in database
GPG key ID: A4F5D403F118200A
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ext/curl/interface.c
View file

@ -60,7 +60,6 @@
#include "ext/standard/file.h"
#include "ext/standard/url.h"
#include "curl_private.h"
#include "curl_arginfo.h"
#ifdef __GNUC__
/* don't complain about deprecated CURLOPT_* we're exposing to PHP; we
@ -68,6 +67,8 @@
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
#include "curl_arginfo.h"
#ifdef PHP_CURL_NEED_OPENSSL_TSL /* {{{ */
static MUTEX_T *php_curl_openssl_tsl = NULL;