Fix [-Wundef] warning in Readline extension

Author: Girgias

ext/readline/php_readline.h

@@ -17,7 +17,7 @@
 #ifndef PHP_READLINE_H
 #define PHP_READLINE_H
 
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
+#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT)
 
 extern zend_module_entry readline_module_entry;
 #define phpext_readline_ptr &readline_module_entry

ext/readline/readline.c

@@ -25,7 +25,7 @@
 #include "readline_cli.h"
 #include "readline_arginfo.h"
 
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
+#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT)
 
 #ifndef HAVE_RL_COMPLETION_MATCHES
 #define rl_completion_matches completion_matches
@@ -38,7 +38,7 @@
 #include <readline/history.h>
 #endif
 
-#if HAVE_RL_CALLBACK_READ_CHAR
+#ifdef HAVE_RL_CALLBACK_READ_CHAR
 
 static zval _prepped_callback;
 
@@ -74,12 +74,12 @@ ZEND_GET_MODULE(readline)
 
 PHP_MINIT_FUNCTION(readline)
 {
-#if HAVE_LIBREADLINE
+#ifdef HAVE_LIBREADLINE
 		/* libedit don't need this call which set the tty in cooked mode */
 	using_history();
 #endif
 	ZVAL_UNDEF(&_readline_completion);
-#if HAVE_RL_CALLBACK_READ_CHAR
+#ifdef HAVE_RL_CALLBACK_READ_CHAR
 	ZVAL_UNDEF(&_prepped_callback);
 #endif
    	return PHP_MINIT(cli_readline)(INIT_FUNC_ARGS_PASSTHRU);
@@ -94,7 +94,7 @@ PHP_RSHUTDOWN_FUNCTION(readline)
 {
 	zval_ptr_dtor(&_readline_completion);
 	ZVAL_UNDEF(&_readline_completion);
-#if HAVE_RL_CALLBACK_READ_CHAR
+#ifdef HAVE_RL_CALLBACK_READ_CHAR
 	if (Z_TYPE(_prepped_callback) != IS_UNDEF) {
 		rl_callback_handler_remove();
 		zval_ptr_dtor(&_prepped_callback);
@@ -168,7 +168,7 @@ PHP_FUNCTION(readline_info)
 				: ZSTR_CHAR(rl_completion_append_character));
 		add_assoc_bool(return_value,"completion_suppress_append",rl_completion_suppress_append);
 #endif
-#if HAVE_ERASE_EMPTY_LINE
+#ifdef HAVE_ERASE_EMPTY_LINE
 		add_assoc_long(return_value,"erase_empty_line",rl_erase_empty_line);
 #endif
 #ifndef PHP_WIN32
@@ -232,7 +232,7 @@ PHP_FUNCTION(readline_info)
 			RETVAL_INTERNED_STR(
 				oldval == 0 ? ZSTR_EMPTY_ALLOC() : ZSTR_CHAR(oldval));
 #endif
-#if HAVE_ERASE_EMPTY_LINE
+#ifdef HAVE_ERASE_EMPTY_LINE
 		} else if (!strcasecmp(what, "erase_empty_line")) {
 			oldval = rl_erase_empty_line;
 			if (value) {
@@ -288,7 +288,7 @@ PHP_FUNCTION(readline_clear_history)
 		RETURN_THROWS();
 	}
 
-#if HAVE_LIBEDIT
+#ifdef HAVE_LIBEDIT
 	/* clear_history is the only function where rl_initialize
 	   is not call to ensure correct allocation */
 	using_history();
@@ -489,7 +489,7 @@ PHP_FUNCTION(readline_completion_function)
 
 /* }}} */
 
-#if HAVE_RL_CALLBACK_READ_CHAR
+#ifdef HAVE_RL_CALLBACK_READ_CHAR
 
 static void php_rl_callback_handler(char *the_line)
 {
@@ -568,7 +568,7 @@ PHP_FUNCTION(readline_redisplay)
 		RETURN_THROWS();
 	}
 
-#if HAVE_LIBEDIT
+#ifdef HAVE_LIBEDIT
 	/* seems libedit doesn't take care of rl_initialize in rl_redisplay
 	 * see bug #72538 */
 	using_history();
@@ -579,7 +579,7 @@ PHP_FUNCTION(readline_redisplay)
 
 #endif
 
-#if HAVE_RL_ON_NEW_LINE
+#ifdef HAVE_RL_ON_NEW_LINE
 /* {{{ Inform readline that the cursor has moved to a new line */
 PHP_FUNCTION(readline_on_new_line)
 {

ext/readline/readline.stub.php

@@ -24,8 +24,7 @@ function readline_write_history(?string $filename = null): bool {}
 
 function readline_completion_function(callable $funcname): bool {}
 
-
-#if HAVE_RL_CALLBACK_READ_CHAR
+#ifdef HAVE_RL_CALLBACK_READ_CHAR
 function readline_callback_handler_install(string $prompt, callable $callback): bool {}
 
 function readline_callback_read_char(): void {}
@@ -34,7 +33,7 @@ function readline_callback_handler_remove(): bool {}
 
 function readline_redisplay(): void {}
 
-#if HAVE_RL_ON_NEW_LINE
+#ifdef HAVE_RL_ON_NEW_LINE
 function readline_on_new_line(): void {}
 #endif
 #endif

ext/readline/readline_arginfo.h

@@ -32,28 +32,28 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_readline_completion_function, 0,
 	ZEND_ARG_TYPE_INFO(0, funcname, IS_CALLABLE, 0)
 ZEND_END_ARG_INFO()
 
-#if HAVE_RL_CALLBACK_READ_CHAR
+#if defined(HAVE_RL_CALLBACK_READ_CHAR)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_readline_callback_handler_install, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, prompt, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
 ZEND_END_ARG_INFO()
 #endif
 
-#if HAVE_RL_CALLBACK_READ_CHAR
+#if defined(HAVE_RL_CALLBACK_READ_CHAR)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_readline_callback_read_char, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
 #endif
 
-#if HAVE_RL_CALLBACK_READ_CHAR
+#if defined(HAVE_RL_CALLBACK_READ_CHAR)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_readline_callback_handler_remove, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 #endif
 
-#if HAVE_RL_CALLBACK_READ_CHAR
+#if defined(HAVE_RL_CALLBACK_READ_CHAR)
 #define arginfo_readline_redisplay arginfo_readline_callback_read_char
 #endif
 
-#if HAVE_RL_CALLBACK_READ_CHAR && HAVE_RL_ON_NEW_LINE
+#if defined(HAVE_RL_CALLBACK_READ_CHAR) && defined(HAVE_RL_ON_NEW_LINE)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_readline_on_new_line, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
 #endif
@@ -69,19 +69,19 @@ ZEND_FUNCTION(readline_list_history);
 ZEND_FUNCTION(readline_read_history);
 ZEND_FUNCTION(readline_write_history);
 ZEND_FUNCTION(readline_completion_function);
-#if HAVE_RL_CALLBACK_READ_CHAR
+#if defined(HAVE_RL_CALLBACK_READ_CHAR)
 ZEND_FUNCTION(readline_callback_handler_install);
 #endif
-#if HAVE_RL_CALLBACK_READ_CHAR
+#if defined(HAVE_RL_CALLBACK_READ_CHAR)
 ZEND_FUNCTION(readline_callback_read_char);
 #endif
-#if HAVE_RL_CALLBACK_READ_CHAR
+#if defined(HAVE_RL_CALLBACK_READ_CHAR)
 ZEND_FUNCTION(readline_callback_handler_remove);
 #endif
-#if HAVE_RL_CALLBACK_READ_CHAR
+#if defined(HAVE_RL_CALLBACK_READ_CHAR)
 ZEND_FUNCTION(readline_redisplay);
 #endif
-#if HAVE_RL_CALLBACK_READ_CHAR && HAVE_RL_ON_NEW_LINE
+#if defined(HAVE_RL_CALLBACK_READ_CHAR) && defined(HAVE_RL_ON_NEW_LINE)
 ZEND_FUNCTION(readline_on_new_line);
 #endif
 
@@ -97,19 +97,19 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(readline_read_history, arginfo_readline_read_history)
 	ZEND_FE(readline_write_history, arginfo_readline_write_history)
 	ZEND_FE(readline_completion_function, arginfo_readline_completion_function)
-#if HAVE_RL_CALLBACK_READ_CHAR
+#if defined(HAVE_RL_CALLBACK_READ_CHAR)
 	ZEND_FE(readline_callback_handler_install, arginfo_readline_callback_handler_install)
 #endif
-#if HAVE_RL_CALLBACK_READ_CHAR
+#if defined(HAVE_RL_CALLBACK_READ_CHAR)
 	ZEND_FE(readline_callback_read_char, arginfo_readline_callback_read_char)
 #endif
-#if HAVE_RL_CALLBACK_READ_CHAR
+#if defined(HAVE_RL_CALLBACK_READ_CHAR)
 	ZEND_FE(readline_callback_handler_remove, arginfo_readline_callback_handler_remove)
 #endif
-#if HAVE_RL_CALLBACK_READ_CHAR
+#if defined(HAVE_RL_CALLBACK_READ_CHAR)
 	ZEND_FE(readline_redisplay, arginfo_readline_redisplay)
 #endif
-#if HAVE_RL_CALLBACK_READ_CHAR && HAVE_RL_ON_NEW_LINE
+#if defined(HAVE_RL_CALLBACK_READ_CHAR) && defined(HAVE_RL_ON_NEW_LINE)
 	ZEND_FE(readline_on_new_line, arginfo_readline_on_new_line)
 #endif
 	ZEND_FE_END

ext/readline/readline_cli.c

@@ -45,7 +45,7 @@
 #include <unixlib/local.h>
 #endif
 
-#if HAVE_LIBEDIT
+#ifdef HAVE_LIBEDIT
 #include <editline/readline.h>
 #else
 #include <readline/readline.h>
@@ -670,7 +670,7 @@ static int readline_shell_run(void) /* {{{ */
 		}
 
 		if (history_lines_to_write) {
-#if HAVE_LIBEDIT
+#ifdef HAVE_LIBEDIT
 			write_history(history_file);
 #else
 			append_history(history_lines_to_write, history_file);
@@ -753,7 +753,7 @@ PHP_MINIT_FUNCTION(cli_readline)
 	ZEND_INIT_MODULE_GLOBALS(cli_readline, cli_readline_init_globals, NULL);
 	REGISTER_INI_ENTRIES();
 
-#if HAVE_LIBEDIT
+#ifdef HAVE_LIBEDIT
 	REGISTER_STRING_CONSTANT("READLINE_LIB", "libedit", CONST_CS|CONST_PERSISTENT);
 #else
 	REGISTER_STRING_CONSTANT("READLINE_LIB", "readline", CONST_CS|CONST_PERSISTENT);