Skip to content

gh-109191: Fix build with newer editline #110239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
corona10 merged 5 commits into from
Oct 9, 2023
Merged

gh-109191: Fix build with newer editline #110239

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e2e2cf2
gh-109191: Fix build with newer editline
Bo98 Oct 2, 2023
b56fd61
configure.ac: correct style
Bo98 Oct 4, 2023
8da562c
configure: regen
Bo98 Oct 4, 2023
19e5950
📜🤖 Added by blurb_it.
blurb-it[bot] Oct 5, 2023
3ef8145
Update Misc/NEWS.d/next/Build/2023-10-05-11-46-20.gh-issue-109191.imU…
erlend-aasland Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
gh-109191: Fix build with newer editline
  • Loading branch information
@Bo98
Bo98 committed Oct 2, 2023
commit e2e2cf2e57127f793db1e4fe7959ac5b3e7038cb
2 changes: 1 addition & 1 deletion Modules/readline.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ readline_set_completion_display_matches_hook_impl(PyObject *module,
default completion display. */
rl_completion_display_matches_hook =
readlinestate_global->completion_display_matches_hook ?
#if defined(_RL_FUNCTION_TYPEDEF)
#if defined(HAVE_RL_COMPDISP_FUNC_T)
(rl_compdisp_func_t *)on_completion_display_matches_hook : 0;
#else
(VFunction *)on_completion_display_matches_hook : 0;
Expand Down
21 changes: 21 additions & 0 deletions configure
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5992,6 +5992,11 @@ AS_VAR_IF([with_readline], [no], [
AC_DEFINE([HAVE_RL_APPEND_HISTORY], [1], [Define if readline supports append_history])
])

# in readline as well as newer editline (April 2023)
AC_CHECK_TYPE([rl_compdisp_func_t], [
AC_DEFINE([HAVE_RL_COMPDISP_FUNC_T], [1], [Define if readline supports rl_compdisp_func_t])
], [], [readline_includes])
Comment thread
Bo98 marked this conversation as resolved.
Outdated

m4_undefine([readline_includes])
])dnl WITH_SAVE_ENV()
])
Expand Down
3 changes: 3 additions & 0 deletions pyconfig.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,6 +983,9 @@
/* Define if you can turn off readline's signal handling. */
#undef HAVE_RL_CATCH_SIGNAL

/* Define if readline supports rl_compdisp_func_t */
#undef HAVE_RL_COMPDISP_FUNC_T

/* Define if you have readline 2.2 */
#undef HAVE_RL_COMPLETION_APPEND_CHARACTER

Expand Down