Renamed Py_input_hook to PyOS_InputHook.
Also cleaned out some CR's left by the VC++ editor.
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index f45e29c..c3d1b61 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -1480,7 +1480,7 @@
init_tkinter()
{
#ifndef WIN32
- extern int (*Py_input_hook) ();
+ extern int (*PyOS_InputHook) ();
#endif
PyObject *m, *d;
@@ -1506,8 +1506,8 @@
ins_string(d, "TCL_VERSION", TCL_VERSION);
#ifndef WIN32
- if (Py_input_hook == NULL)
- Py_input_hook = EventHook;
+ if (PyOS_InputHook == NULL)
+ PyOS_InputHook = EventHook;
#endif
if (PyErr_Occurred())
diff --git a/Modules/readline.c b/Modules/readline.c
index 8927630..a1ba13d 100644
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -12,7 +12,7 @@
#include <signal.h>
/* Routines needed from outside (but not declared in a header file). */
-extern int (*Py_input_hook)();
+extern int (*PyOS_InputHook)();
extern char *readline();
extern int rl_initialize();
extern int rl_insert();
@@ -98,7 +98,7 @@
signal(SIGINT, old_inthandler);
return NULL;
}
- rl_event_hook = Py_input_hook;
+ rl_event_hook = PyOS_InputHook;
p = readline(prompt);
signal(SIGINT, old_inthandler);
if (p == NULL) {