1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Fix [-Wundef] warning in FTP extension

This commit is contained in:
George Peter Banyard
2020-05-12 18:02:35 +02:00
parent fb5114c675
commit 8a18116dba
3 changed files with 7 additions and 7 deletions

View File

@@ -21,7 +21,7 @@
#include "php.h"
#if HAVE_FTP
#ifdef HAVE_FTP
#include <stdio.h>
#include <ctype.h>
@@ -45,7 +45,7 @@
#endif
#include <errno.h>
#if HAVE_SYS_TIME_H
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
@@ -816,7 +816,7 @@ ftp_pasv(ftpbuf_t *ftp, int pasv)
return 0;
}
#if HAVE_IPV6
#ifdef HAVE_IPV6
if (sa->sa_family == AF_INET6) {
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) sa;
char *endptr, delimiter;
@@ -1719,7 +1719,7 @@ ftp_getdata(ftpbuf_t *ftp)
data->listener = fd;
#if HAVE_IPV6 && HAVE_INET_NTOP
#if defined(HAVE_IPV6) && defined(HAVE_INET_NTOP)
if (sa->sa_family == AF_INET6) {
/* need to use EPRT */
char eprtarg[INET6_ADDRSTRLEN + sizeof("|x||xxxxx|")];

View File

@@ -25,7 +25,7 @@
# include <openssl/ssl.h>
#endif
#if HAVE_FTP
#ifdef HAVE_FTP
#include "ext/standard/info.h"
#include "ext/standard/file.h"
@@ -52,7 +52,7 @@ zend_module_entry php_ftp_module_entry = {
STANDARD_MODULE_PROPERTIES
};
#if COMPILE_DL_FTP
#ifdef COMPILE_DL_FTP
ZEND_GET_MODULE(php_ftp)
#endif

View File

@@ -18,7 +18,7 @@
#ifndef _INCLUDED_FTP_H
#define _INCLUDED_FTP_H
#if HAVE_FTP
#ifdef HAVE_FTP
extern zend_module_entry php_ftp_module_entry;
#define php_ftp_module_ptr &php_ftp_module_entry