From 3e01f5afb1b52fe26a956190296de0192eedeec1 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 15 Jan 2021 12:30:54 +0100 Subject: Replace zend_bool uses with bool We're starting to see a mix between uses of zend_bool and bool. Replace all usages with the standard bool type everywhere. Of course, zend_bool is retained as an alias. --- win32/readdir.c | 4 ++-- win32/signal.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'win32') diff --git a/win32/readdir.c b/win32/readdir.c index efa7bd5966..8f24416b12 100644 --- a/win32/readdir.c +++ b/win32/readdir.c @@ -32,7 +32,7 @@ DIR *opendir(const char *dir) HANDLE handle; char resolved_path_buff[MAXPATHLEN]; size_t resolvedw_len, filespecw_len, index; - zend_bool might_need_prefix; + bool might_need_prefix; if (!VCWD_REALPATH(dir, resolved_path_buff)) { return NULL; @@ -151,7 +151,7 @@ int rewinddir(DIR *dp) wchar_t *filespecw; HANDLE handle; size_t dirw_len, filespecw_len, index; - zend_bool might_need_prefix; + bool might_need_prefix; FindClose(dp->handle); diff --git a/win32/signal.c b/win32/signal.c index 23a5acbff9..7604a3aac9 100644 --- a/win32/signal.c +++ b/win32/signal.c @@ -22,7 +22,7 @@ /* true globals; only used from main thread and from kernel callback */ static zval ctrl_handler; static DWORD ctrl_evt = (DWORD)-1; -static zend_bool *vm_interrupt_flag = NULL; +static bool *vm_interrupt_flag = NULL; static void (*orig_interrupt_function)(zend_execute_data *execute_data); @@ -89,7 +89,7 @@ PHP_FUNCTION(sapi_windows_set_ctrl_handler) { zend_fcall_info fci; zend_fcall_info_cache fcc; - zend_bool add = 1; + bool add = 1; /* callable argument corresponds to the CTRL handler */ @@ -134,7 +134,7 @@ PHP_FUNCTION(sapi_windows_set_ctrl_handler) PHP_FUNCTION(sapi_windows_generate_ctrl_event) {/*{{{*/ zend_long evt, pid = 0; - zend_bool ret = 0; + bool ret = 0; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|l", &evt, &pid) == FAILURE) { RETURN_THROWS(); -- cgit v1.2.1