Renamed Py_input_hook to PyOS_InputHook.

Also cleaned out some CR's left by the VC++ editor.

Modules/_tkinter.c

@@ -1480,7 +1480,7 @@ void
 init_tkinter()
 {
 #ifndef WIN32
-	extern int (*Py_input_hook) ();
+	extern int (*PyOS_InputHook) ();
 #endif
 	PyObject *m, *d;
 
@@ -1506,8 +1506,8 @@ init_tkinter()
 	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())

Modules/readline.c

@@ -12,7 +12,7 @@ extern "C" {
 #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 @@ PyOS_GnuReadline(prompt)
 		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) {

PC/python_nt.def

@@ -54,7 +54,7 @@ EXPORTS
 	PySlice_Type DATA
 	Py_InteractiveFlag DATA
 	PyCObject_Type DATA
-	Py_input_hook DATA
+	PyOS_InputHook DATA
 	PyOS_ReadlineFunctionPointer DATA
 
 	_PyObject_New

Parser/myreadline.c

@@ -51,7 +51,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "mymalloc.h"
 #include "intrcheck.h"
 
-int (*Py_input_hook)() = NULL;
+int (*PyOS_InputHook)() = NULL;
 
 /* This function restarts a fgets() after an EINTR error occurred
    except if PyOS_InterruptOccurred() returns true. */
@@ -64,8 +64,8 @@ my_fgets(buf, len, fp)
 {
 	char *p;
 	for (;;) {
-		if (Py_input_hook != NULL)
-			(void)(Py_input_hook)();
+		if (PyOS_InputHook != NULL)
+			(void)(PyOS_InputHook)();
 		errno = 0;
 		p = fgets(buf, len, fp);
 		if (p != NULL)