Fix [-Wundef] warnigns in standard extension

Author: Girgias

ext/standard/basic_functions.c

@@ -67,22 +67,22 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 #include "win32/inet.h"
 #endif
 
-#if HAVE_ARPA_INET_H
+#ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
 
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
 #include <string.h>
 #include <locale.h>
 
-#if HAVE_SYS_MMAN_H
+#ifdef HAVE_SYS_MMAN_H
 # include <sys/mman.h>
 #endif
 
-#if HAVE_SYS_LOADAVG_H
+#ifdef HAVE_SYS_LOADAVG_H
 # include <sys/loadavg.h>
 #endif
 
@@ -91,7 +91,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 #endif
 
 #ifndef INADDR_NONE
-#define INADDR_NONE ((zend_ulong) -1)
+# define INADDR_NONE ((zend_ulong) -1)
 #endif
 
 #include "zend_globals.h"
@@ -141,25 +141,25 @@ zend_module_entry basic_functions_module = { /* {{{ */
 };
 /* }}} */
 
-#if defined(HAVE_PUTENV)
+#ifdef HAVE_PUTENV
 static void php_putenv_destructor(zval *zv) /* {{{ */
 {
 	putenv_entry *pe = Z_PTR_P(zv);
 
 	if (pe->previous_value) {
-# if defined(PHP_WIN32)
+# ifdef PHP_WIN32
 		/* MSVCRT has a bug in putenv() when setting a variable that
 		 * is already set; if the SetEnvironmentVariable() API call
 		 * fails, the Crt will double free() a string.
 		 * We try to avoid this by setting our own value first */
 		SetEnvironmentVariable(pe->key, "bugbug");
 # endif
 		putenv(pe->previous_value);
-# if defined(PHP_WIN32)
+# ifdef PHP_WIN32
 		efree(pe->previous_value);
 # endif
 	} else {
-# if HAVE_UNSETENV
+# ifdef HAVE_UNSETENV
 		unsetenv(pe->key);
 # elif defined(PHP_WIN32)
 		SetEnvironmentVariable(pe->key, NULL);
@@ -273,14 +273,14 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
 {
 #ifdef ZTS
 	ts_allocate_id(&basic_globals_id, sizeof(php_basic_globals), (ts_allocate_ctor) basic_globals_ctor, (ts_allocate_dtor) basic_globals_dtor);
-#ifdef PHP_WIN32
+# ifdef PHP_WIN32
 	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 );
-#endif
+# endif
 #else
 	basic_globals_ctor(&basic_globals);
-#ifdef PHP_WIN32
+# ifdef PHP_WIN32
 	php_win32_core_globals_ctor(&the_php_win32_core_globals);
-#endif
+# endif
 #endif
 
 	php_register_incomplete_class();
@@ -335,7 +335,7 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
 	REGISTER_LONG_CONSTANT("PHP_ROUND_HALF_EVEN", PHP_ROUND_HALF_EVEN, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("PHP_ROUND_HALF_ODD", PHP_ROUND_HALF_ODD, CONST_CS | CONST_PERSISTENT);
 
-#if ENABLE_TEST_CLASS
+#ifdef ENABLE_TEST_CLASS
 	test_class_startup();
 #endif
 
@@ -352,23 +352,23 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
 	BASIC_MINIT_SUBMODULE(password)
 	BASIC_MINIT_SUBMODULE(mt_rand)
 
-#if defined(ZTS)
+#ifdef ZTS
 	BASIC_MINIT_SUBMODULE(localeconv)
 #endif
 
-#if defined(HAVE_NL_LANGINFO)
+#ifdef HAVE_NL_LANGINFO
 	BASIC_MINIT_SUBMODULE(nl_langinfo)
 #endif
 
-#if ZEND_INTRIN_SSE4_2_FUNC_PTR
+#ifdef ZEND_INTRIN_SSE4_2_FUNC_PTR
 	BASIC_MINIT_SUBMODULE(string_intrin)
 #endif
 
-#if ZEND_INTRIN_SSE4_2_PCLMUL_FUNC_PTR
+#ifdef ZEND_INTRIN_SSE4_2_PCLMUL_FUNC_PTR
 	BASIC_MINIT_SUBMODULE(crc32_x86_intrin)
 #endif
 
-#if ZEND_INTRIN_AVX2_FUNC_PTR || ZEND_INTRIN_SSSE3_FUNC_PTR
+#if defined(ZEND_INTRIN_AVX2_FUNC_PTR) || defined(ZEND_INTRIN_SSSE3_FUNC_PTR)
 	BASIC_MINIT_SUBMODULE(base64_intrin)
 #endif
 
@@ -399,8 +399,8 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
 	php_register_url_stream_wrapper("http", &php_stream_http_wrapper);
 	php_register_url_stream_wrapper("ftp", &php_stream_ftp_wrapper);
 
-#if defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC
-# if defined(PHP_WIN32) || HAVE_FULL_DNS_FUNCS
+#if defined(PHP_WIN32) || defined(HAVE_DNS_SEARCH_FUNC)
+# if defined(PHP_WIN32) || defined(HAVE_FULL_DNS_FUNCS)
 	BASIC_MINIT_SUBMODULE(dns)
 # endif
 #endif
@@ -440,7 +440,7 @@ PHP_MSHUTDOWN_FUNCTION(basic) /* {{{ */
 	BASIC_MSHUTDOWN_SUBMODULE(url_scanner_ex)
 	BASIC_MSHUTDOWN_SUBMODULE(file)
 	BASIC_MSHUTDOWN_SUBMODULE(standard_filters)
-#if defined(ZTS)
+#ifdef ZTS
 	BASIC_MSHUTDOWN_SUBMODULE(localeconv)
 #endif
 	BASIC_MSHUTDOWN_SUBMODULE(crypt)
@@ -876,7 +876,7 @@ PHP_FUNCTION(putenv)
 	pe.previous_value = NULL;
 	for (env = environ; env != NULL && *env != NULL; env++) {
 		if (!strncmp(*env, pe.key, pe.key_len) && (*env)[pe.key_len] == '=') {	/* found it */
-#if defined(PHP_WIN32)
+#ifdef PHP_WIN32
 			/* must copy previous value because MSVCRT's putenv can free the string without notice */
 			pe.previous_value = estrdup(*env);
 #else
@@ -886,7 +886,7 @@ PHP_FUNCTION(putenv)
 		}
 	}
 
-#if HAVE_UNSETENV
+#ifdef HAVE_UNSETENV
 	if (!p) { /* no '=' means we want to unset it */
 		unsetenv(pe.putenv_string);
 	}
@@ -932,15 +932,15 @@ PHP_FUNCTION(putenv)
 		}
 #endif
 		tsrm_env_unlock();
-#if defined(PHP_WIN32)
+#ifdef PHP_WIN32
 		free(keyw);
 		free(valw);
 #endif
 		RETURN_TRUE;
 	} else {
 		efree(pe.putenv_string);
 		efree(pe.key);
-#if defined(PHP_WIN32)
+#ifdef PHP_WIN32
 		free(keyw);
 		free(valw);
 #endif
@@ -1245,13 +1245,13 @@ PHP_FUNCTION(usleep)
 		RETURN_THROWS();
 	}
 
-#if HAVE_USLEEP
+#ifdef HAVE_USLEEP
 	usleep((unsigned int)num);
 #endif
 }
 /* }}} */
 
-#if HAVE_NANOSLEEP
+#ifdef HAVE_NANOSLEEP
 /* {{{ Delay for a number of seconds and nano seconds */
 PHP_FUNCTION(time_nanosleep)
 {
@@ -2271,7 +2271,7 @@ PHP_FUNCTION(ignore_user_abort)
 }
 /* }}} */
 
-#if HAVE_GETSERVBYNAME
+#ifdef HAVE_GETSERVBYNAME
 /* {{{ Returns port associated with service. Protocol must be "tcp" or "udp" */
 PHP_FUNCTION(getservbyname)
 {
@@ -2295,7 +2295,7 @@ PHP_FUNCTION(getservbyname)
 
 	serv = getservbyname(name, proto);
 
-#if defined(_AIX)
+#ifdef _AIX
 	/*
         On AIX, imap is only known as imap2 in /etc/services, while on Linux imap is an alias for imap2.
         If a request for imap gives no result, we try again with imap2.
@@ -2313,7 +2313,7 @@ PHP_FUNCTION(getservbyname)
 /* }}} */
 #endif
 
-#if HAVE_GETSERVBYPORT
+#ifdef HAVE_GETSERVBYPORT
 /* {{{ Returns service name associated with port. Protocol must be "tcp" or "udp" */
 PHP_FUNCTION(getservbyport)
 {
@@ -2338,7 +2338,7 @@ PHP_FUNCTION(getservbyport)
 /* }}} */
 #endif
 
-#if HAVE_GETPROTOBYNAME
+#ifdef HAVE_GETPROTOBYNAME
 /* {{{ Returns protocol number associated with name as per /etc/protocols */
 PHP_FUNCTION(getprotobyname)
 {
@@ -2361,7 +2361,7 @@ PHP_FUNCTION(getprotobyname)
 /* }}} */
 #endif
 
-#if HAVE_GETPROTOBYNUMBER
+#ifdef HAVE_GETPROTOBYNUMBER
 /* {{{ Returns protocol name associated with protocol number proto */
 PHP_FUNCTION(getprotobynumber)
 {

ext/standard/basic_functions.stub.php

@@ -281,7 +281,7 @@ function sleep(int $seconds): int {}
 
 function usleep(int $microseconds): void {}
 
-#if HAVE_NANOSLEEP
+#ifdef HAVE_NANOSLEEP
 function time_nanosleep(int $seconds, int $nanoseconds): array|bool {}
 
 function time_sleep_until(float $timestamp): bool {}
@@ -340,19 +340,19 @@ function connection_status(): int {}
 
 function ignore_user_abort(?bool $value = null): int {}
 
-#if HAVE_GETSERVBYNAME
+#ifdef HAVE_GETSERVBYNAME
 function getservbyname(string $service, string $protocol): int|false {}
 #endif
 
-#if HAVE_GETSERVBYPORT
+#ifdef HAVE_GETSERVBYPORT
 function getservbyport(int $port, string $protocol): string|false {}
 #endif
 
-#if HAVE_GETPROTOBYNAME
+#ifdef HAVE_GETPROTOBYNAME
 function getprotobyname(string $name): int|false {}
 #endif
 
-#if HAVE_GETPROTOBYNUMBER
+#ifdef HAVE_GETPROTOBYNUMBER
 function getprotobynumber(int $protocol): string|false {}
 #endif
 
@@ -390,7 +390,7 @@ function crypt(string $str, string $salt): string {}
 
 /* datetime.c */
 
-#if HAVE_STRPTIME
+#ifdef HAVE_STRPTIME
 function strptime(string $timestamp, string $format): array|false {}
 #endif
 
@@ -406,7 +406,7 @@ function gethostbyname(string $hostname): string {}
 
 function gethostbynamel(string $hostname): array|false {}
 
-#if defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC
+#if defined(PHP_WIN32) || defined(HAVE_DNS_SEARCH_FUNC)
 function dns_check_record(string $hostname, string $type = "MX"): bool {}
 
 /** @alias dns_check_record */
@@ -438,7 +438,7 @@ function net_get_interfaces(): array|false {}
 
 /* ftok.c */
 
-#if HAVE_FTOK
+#ifdef HAVE_FTOK
 function ftok(string $pathname, string $proj): int {}
 #endif
 
@@ -546,7 +546,7 @@ function strspn(string $str, string $mask, int $start = 0, ?int $len = null): in
 
 function strcspn(string $str, string $mask, int $start = 0, ?int $len = null): int {}
 
-#if HAVE_NL_LANGINFO
+#ifdef HAVE_NL_LANGINFO
 function nl_langinfo(int $item): string|false {}
 #endif
 
@@ -713,7 +713,7 @@ function closedir($dir_handle = null): void {}
 
 function chdir(string $directory): bool {}
 
-#if defined(HAVE_CHROOT) && !defined(ZTS) && ENABLE_CHROOT_FUNC
+#if defined(HAVE_CHROOT) && !defined(ZTS) && defined(ENABLE_CHROOT_FUNC)
 function chroot(string $directory): bool {}
 #endif
 
@@ -919,15 +919,15 @@ function chown(string $filename, string|int $user): bool {}
 
 function chgrp(string $filename, string|int $group): bool {}
 
-#if HAVE_LCHOWN
+#ifdef HAVE_LCHOWN
 function lchown(string $filename, string|int $user): bool {}
 
 function lchgrp(string $filename, string|int $group): bool {}
 #endif
 
 function chmod(string $filename, int $mode): bool {}
 
-#if HAVE_UTIME
+#ifdef HAVE_UTIME
 function touch(string $filename, ?int $time = null, ?int $atime = null): bool {}
 #endif
 
@@ -1288,7 +1288,7 @@ function stream_socket_enable_crypto($stream, bool $enable, ?int $crypto_type =
 function stream_socket_shutdown($stream, int $how): bool {}
 #endif
 
-#if HAVE_SOCKETPAIR
+#ifdef HAVE_SOCKETPAIR
 function stream_socket_pair(int $domain, int $type, int $protocol): array|false {}
 #endif
 
@@ -1357,7 +1357,7 @@ function sapi_windows_vt100_support($stream, ?bool $enable = null): bool {}
 /** @param resource $stream */
 function stream_set_chunk_size($stream, int $size): int {}
 
-#if HAVE_SYS_TIME_H || defined(PHP_WIN32)
+#if defined(HAVE_SYS_TIME_H) || defined(PHP_WIN32)
 /** @param resource $socket */
 function stream_set_timeout($socket, int $seconds, int $microseconds = 0): bool {}