Skip to content

Sync #if/ifdef/defined (-Wundef) #22474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
petk wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −8
Open

Sync #if/ifdef/defined (-Wundef) #22474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Zend/zend_hrtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#elif defined(_WIN32) || defined(_WIN64)
# undef ZEND_HRTIME_PLATFORM_WINDOWS
# define ZEND_HRTIME_PLATFORM_WINDOWS 1
#elif HAVE_CLOCK_GETTIME_NSEC_NP
#elif defined(HAVE_CLOCK_GETTIME_NSEC_NP)
# undef ZEND_HRTIME_PLATFORM_APPLE_GETTIME_NSEC
# define ZEND_HRTIME_PLATFORM_APPLE_GETTIME_NSEC 1
#elif defined(__APPLE__)
Expand Down
2 changes: 1 addition & 1 deletion ext/pcntl/php_pcntl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include "pcntl_decl.h"

#if defined(HAVE_DECL_WCONTINUED) && HAVE_DECL_WCONTINUED == 1 && defined(HAVE_WIFCONTINUED) && HAVE_WIFCONTINUED == 1
#if defined(HAVE_DECL_WCONTINUED) && HAVE_DECL_WCONTINUED == 1 && defined(HAVE_WIFCONTINUED)
#define HAVE_WCONTINUED 1
#endif

Expand Down
8 changes: 4 additions & 4 deletions ext/standard/proc_open.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ static void proc_open_rsrc_dtor(zend_resource *rsrc)
php_process_handle *proc = (php_process_handle*)rsrc->ptr;
#ifdef PHP_WIN32
DWORD wstatus;
#elif HAVE_SYS_WAIT_H
#elif defined(HAVE_SYS_WAIT_H)
int wstatus;
int waitpid_options = 0;
pid_t wait_pid;
Expand Down Expand Up @@ -297,7 +297,7 @@ static void proc_open_rsrc_dtor(zend_resource *rsrc)
}
CloseHandle(proc->childHandle);

#elif HAVE_SYS_WAIT_H
#elif defined(HAVE_SYS_WAIT_H)
if (!FG(pclose_wait)) {
waitpid_options = WNOHANG;
}
Expand Down Expand Up @@ -389,7 +389,7 @@ PHP_FUNCTION(proc_get_status)
php_process_handle *proc;
#ifdef PHP_WIN32
DWORD wstatus;
#elif HAVE_SYS_WAIT_H
#elif defined(HAVE_SYS_WAIT_H)
int wstatus;
pid_t wait_pid;
#endif
Expand Down Expand Up @@ -418,7 +418,7 @@ PHP_FUNCTION(proc_get_status)
* even if the child has already exited. This is because the result stays available
* until the child handle is closed. Hence no caching is used on Windows. */
add_assoc_bool(return_value, "cached", false);
#elif HAVE_SYS_WAIT_H
#elif defined(HAVE_SYS_WAIT_H)
wait_pid = waitpid_cached(proc, &wstatus, WNOHANG|WUNTRACED);

if (wait_pid == proc->child) {
Expand Down
2 changes: 1 addition & 1 deletion main/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2264,7 +2264,7 @@ zend_result php_module_startup(sapi_module_struct *sf, zend_module_entry *additi
zend_reset_lc_ctype_locale();
zend_update_current_locale();

#if HAVE_TZSET
#ifdef HAVE_TZSET
tzset();
#endif

Expand Down
2 changes: 1 addition & 1 deletion main/network.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#endif
#ifdef HAVE_POLL_H
#include <poll.h>
#elif HAVE_SYS_POLL_H
#elif defined(HAVE_SYS_POLL_H)
#include <sys/poll.h>
#endif

Expand Down
Loading