Skip to content

Commit da86eec

Browse files
petkpetk
authored
Sync #if/ifdef/defined (#14371)
These are either undefined or defined to value 1 in Autotools and Windows: - HAVE_COMMONCRYPTO_COMMONRANDOM_H - HAVE_EXIF - HAVE_FOPENCOOKIE - HAVE_IF_NAMETOINDEX - HAVE_LIBICONV - HAVE_SOCKETS - HAVE_STRUCT_STAT_ST_RDEV - HAVE_STRUCT_TM_TM_GMTOFF - HAVE_STRUCT_TM_TM_ZONE Follow up of GH-5526 (-Wundef)
1 parent 58f3b67 commit da86eec

File tree

10 files changed

+15
-15
lines changed

10 files changed

+15
-15
lines changed

‎ext/date/php_date.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,20 +1302,20 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, bool gmt)
13021302
ta.tm_yday = timelib_day_of_year(ts->y, ts->m, ts->d);
13031303
if (gmt) {
13041304
ta.tm_isdst = 0;
1305-
#if HAVE_STRUCT_TM_TM_GMTOFF
1305+
#ifdef HAVE_STRUCT_TM_TM_GMTOFF
13061306
ta.tm_gmtoff = 0;
13071307
#endif
1308-
#if HAVE_STRUCT_TM_TM_ZONE
1308+
#ifdef HAVE_STRUCT_TM_TM_ZONE
13091309
ta.tm_zone = "GMT";
13101310
#endif
13111311
} else {
13121312
offset = timelib_get_time_zone_info(timestamp, tzi);
13131313

13141314
ta.tm_isdst = offset->is_dst;
1315-
#if HAVE_STRUCT_TM_TM_GMTOFF
1315+
#ifdef HAVE_STRUCT_TM_TM_GMTOFF
13161316
ta.tm_gmtoff = offset->offset;
13171317
#endif
1318-
#if HAVE_STRUCT_TM_TM_ZONE
1318+
#ifdef HAVE_STRUCT_TM_TM_ZONE
13191319
ta.tm_zone = offset->abbr;
13201320
#endif
13211321
}

‎ext/iconv/iconv.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
#ifdef PHP_ICONV_IMPL
6060
#define PHP_ICONV_IMPL_VALUE PHP_ICONV_IMPL
61-
#elif HAVE_LIBICONV
61+
#elif defined(HAVE_LIBICONV)
6262
#define PHP_ICONV_IMPL_VALUE "libiconv"
6363
#else
6464
#define PHP_ICONV_IMPL_VALUE "unknown"

‎ext/random/csprng.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
# endif
5454
#endif
5555

56-
#if HAVE_COMMONCRYPTO_COMMONRANDOM_H
56+
#ifdef HAVE_COMMONCRYPTO_COMMONRANDOM_H
5757
# include <CommonCrypto/CommonCryptoError.h>
5858
# include <CommonCrypto/CommonRandom.h>
5959
#endif
@@ -74,7 +74,7 @@ ZEND_ATTRIBUTE_NONNULL PHPAPI zend_result php_random_bytes_ex(void *bytes, size_
7474
snprintf(errstr, errstr_size, "Failed to retrieve randomness from the operating system (BCryptGenRandom)");
7575
return FAILURE;
7676
}
77-
#elif HAVE_COMMONCRYPTO_COMMONRANDOM_H
77+
#elif defined(HAVE_COMMONCRYPTO_COMMONRANDOM_H)
7878
/*
7979
* Purposely prioritized upon arc4random_buf for modern macOs releases
8080
* arc4random api on this platform uses `ccrng_generate` which returns

‎ext/sockets/conversions.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,7 @@ static void from_zval_write_ifindex(const zval *zv, char *uinteger, ser_context
12611261

12621262
str = zval_get_tmp_string((zval *) zv, &tmp_str);
12631263

1264-
#if HAVE_IF_NAMETOINDEX
1264+
#ifdef HAVE_IF_NAMETOINDEX
12651265
ret = if_nametoindex(ZSTR_VAL(str));
12661266
if (ret == 0) {
12671267
do_from_zval_err(ctx, "no interface with name \"%s\" could be found", ZSTR_VAL(str));

‎ext/sockets/multicast.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ static int _php_source_op_to_ipv4_op(enum source_op sop);
6161

6262
zend_result php_string_to_if_index(const char *val, unsigned *out)
6363
{
64-
#if HAVE_IF_NAMETOINDEX
64+
#ifdef HAVE_IF_NAMETOINDEX
6565
unsigned int ind;
6666

6767
ind = if_nametoindex(val);

‎ext/sockets/php_sockets.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# include "config.h"
2525
#endif
2626

27-
#if HAVE_SOCKETS
27+
#ifdef HAVE_SOCKETS
2828

2929
#include <php.h>
3030
#ifdef PHP_WIN32

‎ext/sockets/sockets.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
# include <sys/uio.h>
5252
# define set_errno(a) (errno = a)
5353
# include "php_sockets.h"
54-
# if HAVE_IF_NAMETOINDEX
54+
# ifdef HAVE_IF_NAMETOINDEX
5555
# include <net/if.h>
5656
# endif
5757
# if defined(HAVE_LINUX_SOCK_DIAG_H)

‎main/streams/cast.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ static int stream_cookie_closer(void *cookie)
128128
}
129129
#endif /* elif defined(HAVE_FOPENCOOKIE) */
130130

131-
#if HAVE_FOPENCOOKIE
131+
#ifdef HAVE_FOPENCOOKIE
132132
static cookie_io_functions_t stream_cookie_functions =
133133
{
134134
stream_cookie_reader, stream_cookie_writer,
@@ -220,7 +220,7 @@ PHPAPI int _php_stream_cast(php_stream *stream, int castas, void **ret, int show
220220
goto exit_success;
221221
}
222222

223-
#if HAVE_FOPENCOOKIE
223+
#ifdef HAVE_FOPENCOOKIE
224224
/* if just checking, say yes we can be a FILE*, but don't actually create it yet */
225225
if (ret == NULL) {
226226
goto exit_success;

‎main/streams/userspace.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ static int statbuf_from_array(zval *array, php_stream_statbuf *ssb)
816816
STAT_PROP_ENTRY(nlink);
817817
STAT_PROP_ENTRY(uid);
818818
STAT_PROP_ENTRY(gid);
819-
#if HAVE_STRUCT_STAT_ST_RDEV
819+
#ifdef HAVE_STRUCT_STAT_ST_RDEV
820820
STAT_PROP_ENTRY(rdev);
821821
#endif
822822
STAT_PROP_ENTRY(size);

‎sapi/fuzzer/fuzzer-exif.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "fuzzer-sapi.h"
3232

3333
int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
34-
#if HAVE_EXIF
34+
#ifdef HAVE_EXIF
3535
php_stream *stream;
3636
zval stream_zv;
3737

0 commit comments

Comments
 (0)