archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix [-Wundef] warning in cURL extension

Browse source
This commit is contained in:
George Peter Banyard 2020-05-12 22:36:08 +02:00
parent b35addc585
commit 93b51f4e26
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/curl/curl_file.c
View file

@ -23,7 +23,7 @@
#include "Zend/zend_interfaces.h" #include "Zend/zend_interfaces.h"
#include "php_curl.h" #include "php_curl.h"
#include "curl_file_arginfo.h" #include "curl_file_arginfo.h"
#if HAVE_CURL #ifdef HAVE_CURL
PHP_CURL_API zend_class_entry *curl_CURLFile_class; PHP_CURL_API zend_class_entry *curl_CURLFile_class;

6
ext/curl/interface.c
View file

@ -22,7 +22,7 @@
#include "php.h" #include "php.h"
#if HAVE_CURL #ifdef HAVE_CURL
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -1722,7 +1722,7 @@ static void _php_curl_set_default_options(php_curl *ch)
curl_easy_setopt(ch->cp, CURLOPT_INFILE, (void *) ch); curl_easy_setopt(ch->cp, CURLOPT_INFILE, (void *) ch);
curl_easy_setopt(ch->cp, CURLOPT_HEADERFUNCTION, curl_write_header); curl_easy_setopt(ch->cp, CURLOPT_HEADERFUNCTION, curl_write_header);
curl_easy_setopt(ch->cp, CURLOPT_WRITEHEADER, (void *) ch); curl_easy_setopt(ch->cp, CURLOPT_WRITEHEADER, (void *) ch);
#if !defined(ZTS) #ifndef ZTS
curl_easy_setopt(ch->cp, CURLOPT_DNS_USE_GLOBAL_CACHE, 1); curl_easy_setopt(ch->cp, CURLOPT_DNS_USE_GLOBAL_CACHE, 1);
#endif #endif
curl_easy_setopt(ch->cp, CURLOPT_DNS_CACHE_TIMEOUT, 120); curl_easy_setopt(ch->cp, CURLOPT_DNS_CACHE_TIMEOUT, 120);
@ -1736,7 +1736,7 @@ static void _php_curl_set_default_options(php_curl *ch)
curl_easy_setopt(ch->cp, CURLOPT_CAINFO, cainfo); curl_easy_setopt(ch->cp, CURLOPT_CAINFO, cainfo);
} }
#if defined(ZTS) #ifdef ZTS
curl_easy_setopt(ch->cp, CURLOPT_NOSIGNAL, 1); curl_easy_setopt(ch->cp, CURLOPT_NOSIGNAL, 1);
#endif #endif
} }

2
ext/curl/multi.c
View file

@ -22,7 +22,7 @@
#include "php.h" #include "php.h"
#if HAVE_CURL #ifdef HAVE_CURL
#include "php_curl.h" #include "php_curl.h"

2
ext/curl/php_curl.h
View file

@ -26,7 +26,7 @@
#define HAVE_CURL 1 #define HAVE_CURL 1
#endif #endif
#if HAVE_CURL #ifdef HAVE_CURL
#define PHP_CURL_DEBUG 0 #define PHP_CURL_DEBUG 0

2
ext/curl/share.c
View file

@ -22,7 +22,7 @@
#include "php.h" #include "php.h"
#if HAVE_CURL #ifdef HAVE_CURL
#include "php_curl.h" #include "php_curl.h"