diff options
3 files changed, 102 insertions, 0 deletions
diff --git a/patches/81_all_use_new_readline_function_types__closes__20374_.patch b/patches/81_all_use_new_readline_function_types__closes__20374_.patch new file mode 100644 index 0000000..419f7a0 --- /dev/null +++ b/patches/81_all_use_new_readline_function_types__closes__20374_.patch @@ -0,0 +1,28 @@ +# HG changeset patch +# User Benjamin Peterson <benjamin@python.org> +# Date 1390541532 18000 +# Fri Jan 24 00:32:12 2014 -0500 +# Branch 3.3 +# Node ID fb2259d9f6b4104be0015068e3293b3abb68dce7 +# Parent fed5d501a179138e3b214e463a0bc13943de7ce5 +use new readline function types (closes #20374) + +diff --git a/Modules/readline.c b/Modules/readline.c +--- a/Modules/readline.c ++++ b/Modules/readline.c +@@ -936,12 +936,12 @@ + rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap); + rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap); + /* Set our hook functions */ +- rl_startup_hook = (Function *)on_startup_hook; ++ rl_startup_hook = (rl_hook_func_t *)on_startup_hook; + #ifdef HAVE_RL_PRE_INPUT_HOOK +- rl_pre_input_hook = (Function *)on_pre_input_hook; ++ rl_pre_input_hook = (rl_hook_func_t *)on_pre_input_hook; + #endif + /* Set our completion function */ +- rl_attempted_completion_function = (CPPFunction *)flex_complete; ++ rl_attempted_completion_function = (rl_completion_func_t *)flex_complete; + /* Set Python word break characters */ + completer_word_break_characters = + rl_completer_word_break_characters = diff --git a/patches/82_all_new_plan__just_remove_typecasts__closes__20374_.patch b/patches/82_all_new_plan__just_remove_typecasts__closes__20374_.patch new file mode 100644 index 0000000..d0716f9 --- /dev/null +++ b/patches/82_all_new_plan__just_remove_typecasts__closes__20374_.patch @@ -0,0 +1,37 @@ +# HG changeset patch +# User Benjamin Peterson <benjamin@python.org> +# Date 1390581856 18000 +# Fri Jan 24 11:44:16 2014 -0500 +# Branch 3.3 +# Node ID fc62fcd8e990d80b15177716437f20da49b9dccf +# Parent b3eaeb4bdf84a8f89afaf24c0308bd0d13987844 +new plan: just remove typecasts (closes #20374) + +diff --git a/Modules/readline.c b/Modules/readline.c +--- a/Modules/readline.c ++++ b/Modules/readline.c +@@ -877,7 +877,7 @@ + * before calling the normal completer */ + + static char ** +-flex_complete(char *text, int start, int end) ++flex_complete(const char *text, int start, int end) + { + #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER + rl_completion_append_character ='\0'; +@@ -936,12 +936,12 @@ + rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap); + rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap); + /* Set our hook functions */ +- rl_startup_hook = (rl_hook_func_t *)on_startup_hook; ++ rl_startup_hook = on_startup_hook; + #ifdef HAVE_RL_PRE_INPUT_HOOK +- rl_pre_input_hook = (rl_hook_func_t *)on_pre_input_hook; ++ rl_pre_input_hook = on_pre_input_hook; + #endif + /* Set our completion function */ +- rl_attempted_completion_function = (rl_completion_func_t *)flex_complete; ++ rl_attempted_completion_function = flex_complete; + /* Set Python word break characters */ + completer_word_break_characters = + rl_completer_word_break_characters = diff --git a/patches/83_all_Issue__20374__Avoid_compiler_warnings_when_compiling_readline_with_libedit_.patch b/patches/83_all_Issue__20374__Avoid_compiler_warnings_when_compiling_readline_with_libedit_.patch new file mode 100644 index 0000000..232e666 --- /dev/null +++ b/patches/83_all_Issue__20374__Avoid_compiler_warnings_when_compiling_readline_with_libedit_.patch @@ -0,0 +1,37 @@ +# HG changeset patch +# User Ned Deily <nad@acm.org> +# Date 1391647990 28800 +# Wed Feb 05 16:53:10 2014 -0800 +# Branch 3.3 +# Node ID 9131a9edcac4880b2759c82fb38f13f6f871a73e +# Parent b5fe07d39e163240aed04f71ae7862c7cf36c1e7 +Issue #20374: Avoid compiler warnings when compiling readline with libedit. + +diff --git a/Modules/readline.c b/Modules/readline.c +--- a/Modules/readline.c ++++ b/Modules/readline.c +@@ -773,15 +773,24 @@ + return result; + } + ++ + static int ++#if defined(_RL_FUNCTION_TYPEDEF) + on_startup_hook(void) ++#else ++on_startup_hook() ++#endif + { + return on_hook(startup_hook); + } + + #ifdef HAVE_RL_PRE_INPUT_HOOK + static int ++#if defined(_RL_FUNCTION_TYPEDEF) + on_pre_input_hook(void) ++#else ++on_pre_input_hook() ++#endif + { + return on_hook(pre_input_hook); + } |