Skip to content

Commit c8f9adb

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: ext/curl: suppress -Wdeprecated-declarations in curl_arginfo.h
2 parents 7c244f5 + 2646d76 commit c8f9adb

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

ext/curl/interface.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,15 @@
6060
#include "ext/standard/file.h"
6161
#include "ext/standard/url.h"
6262
#include "curl_private.h"
63-
#include "curl_arginfo.h"
6463

6564
#ifdef __GNUC__
6665
/* don't complain about deprecated CURLOPT_* we're exposing to PHP; we
6766
need to keep using those to avoid breaking PHP API compatibiltiy */
6867
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
6968
#endif
7069

70+
#include "curl_arginfo.h"
71+
7172
#ifdef PHP_CURL_NEED_OPENSSL_TSL /* {{{ */
7273
static MUTEX_T *php_curl_openssl_tsl = NULL;
7374

0 commit comments

Comments
 (0)