From 0220538236fad68473e606cd49e36d6567856461 Mon Sep 17 00:00:00 2001 From: Dong-hee Na Date: Wed, 30 Aug 2023 13:28:24 +0900 Subject: [PATCH] Update --- Modules/readline.c | 4 ++-- configure | 2 +- configure.ac | 4 ++-- pyconfig.h.in | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Modules/readline.c b/Modules/readline.c index 9dc717a4587cbd..e1c23de62015db 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -1020,7 +1020,7 @@ static int #if defined(_RL_FUNCTION_TYPEDEF) on_startup_hook(void) { -#elif defined(__APPLE__) && defined(WITH_APPLE_READLINE) +#elif defined(__APPLE__) && defined(WITH_APPLE_EDITLINE) on_startup_hook(const char *text, int state) { (void)text; @@ -1041,7 +1041,7 @@ static int #if defined(_RL_FUNCTION_TYPEDEF) on_pre_input_hook(void) { -#elif defined(__APPLE__) && defined(WITH_APPLE_READLINE) +#elif defined(__APPLE__) && defined(WITH_APPLE_EDITLINE) on_pre_input_hook(const char *text, int state) { (void)text; diff --git a/configure b/configure index 5c49cb6f721e9d..0661f69751ae40 100755 --- a/configure +++ b/configure @@ -23785,7 +23785,7 @@ then : case $ac_sys_system/$ac_sys_release in #( Darwin/*) : - printf "%s\n" "#define WITH_APPLE_READLINE 1" >>confdefs.h + printf "%s\n" "#define WITH_APPLE_EDITLINE 1" >>confdefs.h with_readline=readline ;; #( *) : as_fn_error $? "Only supports for macOS" "$LINENO" 5 ;; diff --git a/configure.ac b/configure.ac index 3cbe6cf6bd7a89..0a0437f1c744aa 100644 --- a/configure.ac +++ b/configure.ac @@ -5813,7 +5813,7 @@ dnl library (tinfo ncursesw ncurses termcap). We now assume that libreadline dnl or readline.pc provide correct linker information. AH_TEMPLATE([WITH_EDITLINE], [Define to build the readline module against libedit.]) -AH_TEMPLATE([WITH_APPLE_READLINE], [Define to build the readline module agains apple builtin readline.]) +AH_TEMPLATE([WITH_APPLE_EDITLINE], [Define to build the readline module against Apple BSD editline.]) AC_ARG_WITH( [readline], @@ -5834,7 +5834,7 @@ AC_ARG_WITH( dnl gh-105323: Need to handle the macOS editline as an alias of readline. AS_VAR_IF([with_readline], [apple], [ AS_CASE([$ac_sys_system/$ac_sys_release], - [Darwin/*], [AC_DEFINE([WITH_APPLE_READLINE]) with_readline=readline], + [Darwin/*], [AC_DEFINE([WITH_APPLE_EDITLINE]) with_readline=readline], [AC_MSG_ERROR([Only supports for macOS])])] ) diff --git a/pyconfig.h.in b/pyconfig.h.in index 1c34784aae74ab..c76a6b9be1df5f 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -1791,8 +1791,8 @@ /* Define if WINDOW in curses.h offers a field _flags. */ #undef WINDOW_HAS_FLAGS -/* Define to build the readline module agains apple builtin readline. */ -#undef WITH_APPLE_READLINE +/* Define to build the readline module against Apple BSD editline. */ +#undef WITH_APPLE_EDITLINE /* Define if you want build the _decimal module using a coroutine-local rather than a thread-local context */