diff options
| author | Tian Gao <gaogaotiantian@hotmail.com> | 2023-12-05 14:52:28 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-05 14:52:28 (GMT) |
| commit | e7e1116a781434763c309b55a31204a98237f7b4 (patch) | |
| tree | b74340d38f7ab6ed1e50a7bf32bf65d7a5e6aad8 | |
| parent | 8cdfee1bb902fd1e38d79170b751ef13a0907262 (diff) | |
| download | cpython-e7e1116a781434763c309b55a31204a98237f7b4.zip cpython-e7e1116a781434763c309b55a31204a98237f7b4.tar.gz cpython-e7e1116a781434763c309b55a31204a98237f7b4.tar.bz2 | |
gh-105323: Remove `WITH_APPLE_EDITLINE` to use the same declaration for all editline (gh-112513)
| -rw-r--r-- | Modules/readline.c | 8 | ||||
| -rwxr-xr-x | configure | 17 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | pyconfig.h.in | 3 |
4 files changed, 2 insertions, 36 deletions
diff --git a/Modules/readline.c b/Modules/readline.c index afbb7f8..e29051c 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -1043,10 +1043,8 @@ on_hook(PyObject *func) static int #if defined(_RL_FUNCTION_TYPEDEF) on_startup_hook(void) -#elif defined(WITH_APPLE_EDITLINE) -on_startup_hook(const char *Py_UNUSED(text), int Py_UNUSED(state)) #else -on_startup_hook(void) +on_startup_hook(const char *Py_UNUSED(text), int Py_UNUSED(state)) #endif { int r; @@ -1065,10 +1063,8 @@ on_startup_hook(void) static int #if defined(_RL_FUNCTION_TYPEDEF) on_pre_input_hook(void) -#elif defined(WITH_APPLE_EDITLINE) -on_pre_input_hook(const char *Py_UNUSED(text), int Py_UNUSED(state)) #else -on_pre_input_hook(void) +on_pre_input_hook(const char *Py_UNUSED(text), int Py_UNUSED(state)) #endif { int r; @@ -23971,7 +23971,6 @@ fi - # Check whether --with-readline was given. if test ${with_readline+y} then : @@ -23994,22 +23993,6 @@ else $as_nop fi -# gh-105323: Need to handle the macOS editline as an alias of readline. -case $ac_sys_system/$ac_sys_release in #( - Darwin/*) : - ac_fn_c_check_type "$LINENO" "Function" "ac_cv_type_Function" "#include <readline/readline.h> -" -if test "x$ac_cv_type_Function" = xyes -then : - printf "%s\n" "#define WITH_APPLE_EDITLINE 1" >>confdefs.h - -fi - ;; #( - *) : - - ;; -esac - if test "x$with_readline" = xreadline then : diff --git a/configure.ac b/configure.ac index b78472e..1512e6d 100644 --- a/configure.ac +++ b/configure.ac @@ -5914,7 +5914,6 @@ 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_EDITLINE], [Define to build the readline module against Apple BSD editline.]) AC_ARG_WITH( [readline], @@ -5931,15 +5930,6 @@ AC_ARG_WITH( [with_readline=readline] ) -# gh-105323: Need to handle the macOS editline as an alias of readline. -AS_CASE([$ac_sys_system/$ac_sys_release], - [Darwin/*], [AC_CHECK_TYPE([Function], - [AC_DEFINE([WITH_APPLE_EDITLINE])], - [], - [@%:@include <readline/readline.h>])], - [] -) - AS_VAR_IF([with_readline], [readline], [ PKG_CHECK_MODULES([LIBREADLINE], [readline], [ LIBREADLINE=readline diff --git a/pyconfig.h.in b/pyconfig.h.in index bf70892..2978fa2 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -1800,9 +1800,6 @@ /* Define if WINDOW in curses.h offers a field _flags. */ #undef WINDOW_HAS_FLAGS -/* 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 */ #undef WITH_DECIMAL_CONTEXTVAR |