diff options
| author | George Peter Banyard <girgias@php.net> | 2020-05-12 17:54:02 +0200 |
|---|---|---|
| committer | George Peter Banyard <girgias@php.net> | 2020-05-12 22:02:12 +0200 |
| commit | 56698afb6dd0ce4c6358c44ea254324e375cff18 (patch) | |
| tree | aa4a01dd79c525a4e0dcfd16a6dad76c083f4ba4 | |
| parent | f87743de9fc07084b8fec6e3a0a8f628ee6fa372 (diff) | |
| download | php-git-56698afb6dd0ce4c6358c44ea254324e375cff18.tar.gz | |
Fix [-Wundef] warning in CLI SAPI
| -rw-r--r-- | sapi/cli/php_cli.c | 6 | ||||
| -rw-r--r-- | sapi/cli/php_http_parser.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index d80b2fb95b..a5fafda4f1 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -489,7 +489,7 @@ static void php_cli_usage(char *argv0) " %s [options] -- [args...]\n" " %s [options] -a\n" "\n" -#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE) +#if (defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT)) && !defined(COMPILE_DL_READLINE) " -a Run as interactive shell\n" #else " -a Run interactively\n" @@ -641,7 +641,7 @@ static int do_cli(int argc, char **argv) /* {{{ */ case 'v': /* show php version & quit */ php_printf("PHP %s (%s) (built: %s %s) ( %s)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, cli_sapi_module.name, __DATE__, __TIME__, -#if ZTS +#ifdef ZTS "ZTS " #else "NTS " @@ -871,7 +871,7 @@ static int do_cli(int argc, char **argv) /* {{{ */ #endif if (interactive) { -#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE) +#if (defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT)) && !defined(COMPILE_DL_READLINE) printf("Interactive shell\n\n"); #else printf("Interactive mode enabled\n\n"); diff --git a/sapi/cli/php_http_parser.c b/sapi/cli/php_http_parser.c index 63769c15ac..6d764b6c0d 100644 --- a/sapi/cli/php_http_parser.c +++ b/sapi/cli/php_http_parser.c @@ -244,7 +244,7 @@ enum flags #define start_state (parser->type == PHP_HTTP_REQUEST ? s_start_req : s_start_res) -#if HTTP_PARSER_STRICT +#ifdef HTTP_PARSER_STRICT # define STRICT_CHECK(cond) if (cond) goto error # define NEW_MESSAGE() (http_should_keep_alive(parser) ? start_state : s_dead) #else |