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. --- sapi/apache2handler/apache_config.c | 2 +- sapi/apache2handler/php_apache.h | 6 +++--- sapi/apache2handler/php_functions.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sapi/apache2handler') diff --git a/sapi/apache2handler/apache_config.c b/sapi/apache2handler/apache_config.c index 0079ac7fea..a68c313ad6 100644 --- a/sapi/apache2handler/apache_config.c +++ b/sapi/apache2handler/apache_config.c @@ -119,7 +119,7 @@ static const char *php_apache_phpini_set(cmd_parms *cmd, void *mconfig, const ch return NULL; } -static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht, zval *zv, zend_hash_key *hash_key, void *pData) +static bool should_overwrite_per_dir_entry(HashTable *target_ht, zval *zv, zend_hash_key *hash_key, void *pData) { php_dir_entry *new_per_dir_entry = Z_PTR_P(zv); php_dir_entry *orig_per_dir_entry; diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h index d6c67c8a8d..54b531ed85 100644 --- a/sapi/apache2handler/php_apache.h +++ b/sapi/apache2handler/php_apache.h @@ -68,9 +68,9 @@ void php_ap2_register_hook(apr_pool_t *p); #define APR_ARRAY_FOREACH_CLOSE() }} typedef struct { - zend_bool engine; - zend_bool xbithack; - zend_bool last_modified; + bool engine; + bool xbithack; + bool last_modified; } php_apache2_info_struct; extern zend_module_entry apache2_module_entry; diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index e7d29450ee..0eada1576d 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -253,7 +253,7 @@ PHP_FUNCTION(apache_setenv) php_struct *ctx; char *variable=NULL, *string_val=NULL; size_t variable_len, string_val_len; - zend_bool walk_to_top = 0; + bool walk_to_top = 0; int arg_count = ZEND_NUM_ARGS(); request_rec *r; @@ -287,7 +287,7 @@ PHP_FUNCTION(apache_getenv) php_struct *ctx; char *variable; size_t variable_len; - zend_bool walk_to_top = 0; + bool walk_to_top = 0; int arg_count = ZEND_NUM_ARGS(); char *env_val=NULL; request_rec *r; -- cgit v1.2.1