Skip to content

Commit 5171cb4

Browse files
GirgiasGirgias
committed
Fix [-Wundef] warnings in standard extension
1 parent 62ab929 commit 5171cb4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1352
-341
lines changed

‎ext/standard/basic_functions.c‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -67,22 +67,22 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
6767
#include "win32/inet.h"
6868
#endif
6969

70-
#if HAVE_ARPA_INET_H
70+
#ifdef HAVE_ARPA_INET_H
7171
# include <arpa/inet.h>
7272
#endif
7373

74-
#if HAVE_UNISTD_H
74+
#ifdef HAVE_UNISTD_H
7575
# include <unistd.h>
7676
#endif
7777

7878
#include <string.h>
7979
#include <locale.h>
8080

81-
#if HAVE_SYS_MMAN_H
81+
#ifdef HAVE_SYS_MMAN_H
8282
# include <sys/mman.h>
8383
#endif
8484

85-
#if HAVE_SYS_LOADAVG_H
85+
#ifdef HAVE_SYS_LOADAVG_H
8686
# include <sys/loadavg.h>
8787
#endif
8888

@@ -91,7 +91,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
9191
#endif
9292

9393
#ifndef INADDR_NONE
94-
#define INADDR_NONE ((zend_ulong) -1)
94+
# define INADDR_NONE ((zend_ulong) -1)
9595
#endif
9696

9797
#include "zend_globals.h"
@@ -149,25 +149,25 @@ zend_module_entry basic_functions_module = { /* {{{ */
149149
};
150150
/* }}} */
151151

152-
#if defined(HAVE_PUTENV)
152+
#ifdef HAVE_PUTENV
153153
static void php_putenv_destructor(zval *zv) /* {{{ */
154154
{
155155
putenv_entry *pe = Z_PTR_P(zv);
156156

157157
if (pe->previous_value) {
158-
# if defined(PHP_WIN32)
158+
# ifdef PHP_WIN32
159159
/* MSVCRT has a bug in putenv() when setting a variable that
160160
* is already set; if the SetEnvironmentVariable() API call
161161
* fails, the Crt will double free() a string.
162162
* We try to avoid this by setting our own value first */
163163
SetEnvironmentVariable(ZSTR_VAL(pe->key), "bugbug");
164164
# endif
165165
putenv(pe->previous_value);
166-
# if defined(PHP_WIN32)
166+
# ifdef PHP_WIN32
167167
efree(pe->previous_value);
168168
# endif
169169
} else {
170-
# if HAVE_UNSETENV
170+
# ifdef HAVE_UNSETENV
171171
unsetenv(ZSTR_VAL(pe->key));
172172
# elif defined(PHP_WIN32)
173173
SetEnvironmentVariable(ZSTR_VAL(pe->key), NULL);
@@ -282,14 +282,14 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
282282
{
283283
#ifdef ZTS
284284
ts_allocate_id(&basic_globals_id, sizeof(php_basic_globals), (ts_allocate_ctor) basic_globals_ctor, (ts_allocate_dtor) basic_globals_dtor);
285-
#ifdef PHP_WIN32
285+
# ifdef PHP_WIN32
286286
ts_allocate_id(&php_win32_core_globals_id, sizeof(php_win32_core_globals), (ts_allocate_ctor)php_win32_core_globals_ctor, (ts_allocate_dtor)php_win32_core_globals_dtor );
287-
#endif
287+
# endif
288288
#else
289289
basic_globals_ctor(&basic_globals);
290-
#ifdef PHP_WIN32
290+
# ifdef PHP_WIN32
291291
php_win32_core_globals_ctor(&the_php_win32_core_globals);
292-
#endif
292+
# endif
293293
#endif
294294

295295
php_ce_incomplete_class = register_class___PHP_Incomplete_Class();
@@ -347,7 +347,7 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
347347
REGISTER_LONG_CONSTANT("PHP_ROUND_HALF_EVEN", PHP_ROUND_HALF_EVEN, CONST_CS | CONST_PERSISTENT);
348348
REGISTER_LONG_CONSTANT("PHP_ROUND_HALF_ODD", PHP_ROUND_HALF_ODD, CONST_CS | CONST_PERSISTENT);
349349

350-
#if ENABLE_TEST_CLASS
350+
#ifdef ENABLE_TEST_CLASS
351351
test_class_startup();
352352
#endif
353353

@@ -364,23 +364,23 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
364364
BASIC_MINIT_SUBMODULE(password)
365365
BASIC_MINIT_SUBMODULE(mt_rand)
366366

367-
#if defined(ZTS)
367+
#ifdef ZTS
368368
BASIC_MINIT_SUBMODULE(localeconv)
369369
#endif
370370

371-
#if defined(HAVE_NL_LANGINFO)
371+
#ifdef HAVE_NL_LANGINFO
372372
BASIC_MINIT_SUBMODULE(nl_langinfo)
373373
#endif
374374

375-
#if ZEND_INTRIN_SSE4_2_FUNC_PTR
375+
#ifdef ZEND_INTRIN_SSE4_2_FUNC_PTR
376376
BASIC_MINIT_SUBMODULE(string_intrin)
377377
#endif
378378

379-
#if ZEND_INTRIN_SSE4_2_PCLMUL_FUNC_PTR
379+
#ifdef ZEND_INTRIN_SSE4_2_PCLMUL_FUNC_PTR
380380
BASIC_MINIT_SUBMODULE(crc32_x86_intrin)
381381
#endif
382382

383-
#if ZEND_INTRIN_AVX2_FUNC_PTR || ZEND_INTRIN_SSSE3_FUNC_PTR
383+
#if defined(ZEND_INTRIN_AVX2_FUNC_PTR) || defined(ZEND_INTRIN_SSSE3_FUNC_PTR)
384384
BASIC_MINIT_SUBMODULE(base64_intrin)
385385
#endif
386386

@@ -411,8 +411,8 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
411411
php_register_url_stream_wrapper("http", &php_stream_http_wrapper);
412412
php_register_url_stream_wrapper("ftp", &php_stream_ftp_wrapper);
413413

414-
#if defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC
415-
# if defined(PHP_WIN32) || HAVE_FULL_DNS_FUNCS
414+
#if defined(PHP_WIN32) || defined(HAVE_DNS_SEARCH_FUNC)
415+
# if defined(PHP_WIN32) || defined(HAVE_FULL_DNS_FUNCS)
416416
BASIC_MINIT_SUBMODULE(dns)
417417
# endif
418418
#endif
@@ -452,7 +452,7 @@ PHP_MSHUTDOWN_FUNCTION(basic) /* {{{ */
452452
BASIC_MSHUTDOWN_SUBMODULE(url_scanner_ex)
453453
BASIC_MSHUTDOWN_SUBMODULE(file)
454454
BASIC_MSHUTDOWN_SUBMODULE(standard_filters)
455-
#if defined(ZTS)
455+
#ifdef ZTS
456456
BASIC_MSHUTDOWN_SUBMODULE(localeconv)
457457
#endif
458458
BASIC_MSHUTDOWN_SUBMODULE(crypt)
@@ -876,7 +876,7 @@ PHP_FUNCTION(putenv)
876876
for (env = environ; env != NULL && *env != NULL; env++) {
877877
if (!strncmp(*env, ZSTR_VAL(pe.key), ZSTR_LEN(pe.key))
878878
&& (*env)[ZSTR_LEN(pe.key)] == '=') { /* found it */
879-
#if defined(PHP_WIN32)
879+
#ifdef PHP_WIN32
880880
/* must copy previous value because MSVCRT's putenv can free the string without notice */
881881
pe.previous_value = estrdup(*env);
882882
#else
@@ -886,7 +886,7 @@ PHP_FUNCTION(putenv)
886886
}
887887
}
888888

889-
#if HAVE_UNSETENV
889+
#ifdef HAVE_UNSETENV
890890
if (!p) { /* no '=' means we want to unset it */
891891
unsetenv(pe.putenv_string);
892892
}
@@ -932,15 +932,15 @@ PHP_FUNCTION(putenv)
932932
}
933933
#endif
934934
tsrm_env_unlock();
935-
#if defined(PHP_WIN32)
935+
#ifdef PHP_WIN32
936936
free(keyw);
937937
free(valw);
938938
#endif
939939
RETURN_TRUE;
940940
} else {
941941
free(pe.putenv_string);
942942
zend_string_release(pe.key);
943-
#if defined(PHP_WIN32)
943+
#ifdef PHP_WIN32
944944
free(keyw);
945945
free(valw);
946946
#endif
@@ -1245,13 +1245,13 @@ PHP_FUNCTION(usleep)
12451245
RETURN_THROWS();
12461246
}
12471247

1248-
#if HAVE_USLEEP
1248+
#ifdef HAVE_USLEEP
12491249
usleep((unsigned int)num);
12501250
#endif
12511251
}
12521252
/* }}} */
12531253

1254-
#if HAVE_NANOSLEEP
1254+
#ifdef HAVE_NANOSLEEP
12551255
/* {{{ Delay for a number of seconds and nano seconds */
12561256
PHP_FUNCTION(time_nanosleep)
12571257
{
@@ -2245,7 +2245,7 @@ PHP_FUNCTION(ignore_user_abort)
22452245
}
22462246
/* }}} */
22472247

2248-
#if HAVE_GETSERVBYNAME
2248+
#ifdef HAVE_GETSERVBYNAME
22492249
/* {{{ Returns port associated with service. Protocol must be "tcp" or "udp" */
22502250
PHP_FUNCTION(getservbyname)
22512251
{
@@ -2270,7 +2270,7 @@ PHP_FUNCTION(getservbyname)
22702270

22712271
serv = getservbyname(ZSTR_VAL(name), proto);
22722272

2273-
#if defined(_AIX)
2273+
#ifdef _AIX
22742274
/*
22752275
On AIX, imap is only known as imap2 in /etc/services, while on Linux imap is an alias for imap2.
22762276
If a request for imap gives no result, we try again with imap2.
@@ -2288,7 +2288,7 @@ PHP_FUNCTION(getservbyname)
22882288
/* }}} */
22892289
#endif
22902290

2291-
#if HAVE_GETSERVBYPORT
2291+
#ifdef HAVE_GETSERVBYPORT
22922292
/* {{{ Returns service name associated with port. Protocol must be "tcp" or "udp" */
22932293
PHP_FUNCTION(getservbyport)
22942294
{
@@ -2313,7 +2313,7 @@ PHP_FUNCTION(getservbyport)
23132313
/* }}} */
23142314
#endif
23152315

2316-
#if HAVE_GETPROTOBYNAME
2316+
#ifdef HAVE_GETPROTOBYNAME
23172317
/* {{{ Returns protocol number associated with name as per /etc/protocols */
23182318
PHP_FUNCTION(getprotobyname)
23192319
{
@@ -2336,7 +2336,7 @@ PHP_FUNCTION(getprotobyname)
23362336
/* }}} */
23372337
#endif
23382338

2339-
#if HAVE_GETPROTOBYNUMBER
2339+
#ifdef HAVE_GETPROTOBYNUMBER
23402340
/* {{{ Returns protocol name associated with protocol number proto */
23412341
PHP_FUNCTION(getprotobynumber)
23422342
{

‎ext/standard/basic_functions.stub.php‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ function sleep(int $seconds): int {}
430430

431431
function usleep(int $microseconds): void {}
432432

433-
#if HAVE_NANOSLEEP
433+
#ifdef HAVE_NANOSLEEP
434434
/**
435435
* @return array<string, int>|bool
436436
* @refcount 1
@@ -509,20 +509,20 @@ function connection_status(): int {}
509509

510510
function ignore_user_abort(?bool $enable = null): int {}
511511

512-
#if HAVE_GETSERVBYNAME
512+
#ifdef HAVE_GETSERVBYNAME
513513
function getservbyname(string $service, string $protocol): int|false {}
514514
#endif
515515

516-
#if HAVE_GETSERVBYPORT
516+
#ifdef HAVE_GETSERVBYPORT
517517
/** @refcount 1 */
518518
function getservbyport(int $port, string $protocol): string|false {}
519519
#endif
520520

521-
#if HAVE_GETPROTOBYNAME
521+
#ifdef HAVE_GETPROTOBYNAME
522522
function getprotobyname(string $protocol): int|false {}
523523
#endif
524524

525-
#if HAVE_GETPROTOBYNUMBER
525+
#ifdef HAVE_GETPROTOBYNUMBER
526526
/** @refcount 1 */
527527
function getprotobynumber(int $protocol): string|false {}
528528
#endif
@@ -583,7 +583,7 @@ function crypt(string $string, string $salt): string {}
583583

584584
/* datetime.c */
585585

586-
#if HAVE_STRPTIME
586+
#ifdef HAVE_STRPTIME
587587
/**
588588
* @return array<string, int|string>|false
589589
* @deprecated
@@ -611,7 +611,7 @@ function gethostbyname(string $hostname): string {}
611611
*/
612612
function gethostbynamel(string $hostname): array|false {}
613613

614-
#if defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC
614+
#if defined(PHP_WIN32) || defined(HAVE_DNS_SEARCH_FUNC)
615615
function dns_check_record(string $hostname, string $type = "MX"): bool {}
616616

617617
/** @alias dns_check_record */
@@ -647,7 +647,7 @@ function net_get_interfaces(): array|false {}
647647

648648
/* ftok.c */
649649

650-
#if HAVE_FTOK
650+
#ifdef HAVE_FTOK
651651
function ftok(string $filename, string $project_id): int {}
652652
#endif
653653

@@ -781,7 +781,7 @@ function strspn(string $string, string $characters, int $offset = 0, ?int $lengt
781781

782782
function strcspn(string $string, string $characters, int $offset = 0, ?int $length = null): int {}
783783

784-
#if HAVE_NL_LANGINFO
784+
#ifdef HAVE_NL_LANGINFO
785785
/** @refcount 1 */
786786
function nl_langinfo(int $item): string|false {}
787787
#endif
@@ -1041,7 +1041,7 @@ function closedir($dir_handle = null): void {}
10411041

10421042
function chdir(string $directory): bool {}
10431043

1044-
#if defined(HAVE_CHROOT) && !defined(ZTS) && ENABLE_CHROOT_FUNC
1044+
#if defined(HAVE_CHROOT) && !defined(ZTS) && defined(ENABLE_CHROOT_FUNC)
10451045
function chroot(string $directory): bool {}
10461046
#endif
10471047

@@ -1323,17 +1323,16 @@ function chown(string $filename, string|int $user): bool {}
13231323

13241324
function chgrp(string $filename, string|int $group): bool {}
13251325

1326-
#if HAVE_LCHOWN
1326+
#ifdef HAVE_LCHOWN
13271327
function lchown(string $filename, string|int $user): bool {}
13281328

13291329
function lchgrp(string $filename, string|int $group): bool {}
13301330
#endif
13311331

13321332
function chmod(string $filename, int $permissions): bool {}
13331333

1334-
#if HAVE_UTIME
1334+
#ifdef HAVE_UTIME
13351335
function touch(string $filename, ?int $mtime = null, ?int $atime = null): bool {}
1336-
#endif
13371336

13381337
function clearstatcache(bool $clear_realpath_cache = false, string $filename = ""): void {}
13391338

@@ -1796,7 +1795,7 @@ function stream_socket_enable_crypto($stream, bool $enable, ?int $crypto_method
17961795
function stream_socket_shutdown($stream, int $mode): bool {}
17971796
#endif
17981797

1799-
#if HAVE_SOCKETPAIR
1798+
#ifdef HAVE_SOCKETPAIR
18001799
/**
18011800
* @return array<int, resource>|false
18021801
* @refcount 1
@@ -1888,7 +1887,7 @@ function sapi_windows_vt100_support($stream, ?bool $enable = null): bool {}
18881887
/** @param resource $stream */
18891888
function stream_set_chunk_size($stream, int $size): int {}
18901889

1891-
#if HAVE_SYS_TIME_H || defined(PHP_WIN32)
1890+
#if defined(HAVE_SYS_TIME_H) || defined(PHP_WIN32)
18921891
/** @param resource $stream */
18931892
function stream_set_timeout($stream, int $seconds, int $microseconds = 0): bool {}
18941893

0 commit comments

Comments
 (0)