Alas, get rid of the Win specific hack to ask the user to press Return

before exiting when an error happened.  This didn't work right when
Python is invoked from a daemon.

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 2d065cf22dcfd4899cb997aa4e17792af47ec186..0b5d0d17e82e084216eb77ca43c9fb17feb4b06a 100644 (file)
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -101,7 +101,6 @@ Py_IsInitialized()
 
 */
 
-extern void win_pre_init(), win_pre_exit();
 void
 Py_Initialize()
 {
@@ -113,9 +112,6 @@ Py_Initialize()
        if (initialized)
                return;
        initialized = 1;
-#ifdef MS_WINDOWS
-       win_pre_init();
-#endif
        
        if ((p = getenv("PYTHONDEBUG")) && *p != '\0')
                Py_DebugFlag = 1;
@@ -1102,9 +1098,6 @@ Py_Exit(sts)
 #ifdef macintosh
        PyMac_Exit(sts);
 #else
-#ifdef MS_WINDOWS
-       win_pre_exit(sts);
-#endif
        exit(sts);
 #endif
 }
@@ -1169,43 +1162,3 @@ Py_FdIsInteractive(fp, filename)
               (strcmp(filename, "<stdin>") == 0) ||
               (strcmp(filename, "???") == 0);
 }
-
-#ifdef MS_WINDOWS
-
-#include <windows.h>
-#include <conio.h>
-
-static int its_my_console = -1;
-
-static void
-win_pre_init()
-{
-       HANDLE console;
-       CONSOLE_SCREEN_BUFFER_INFO info;
-       if (its_my_console >= 0)
-               return;
-       its_my_console = 0;
-       console = GetStdHandle(STD_OUTPUT_HANDLE);
-       if (console == INVALID_HANDLE_VALUE)
-               return;
-       if (!GetConsoleScreenBufferInfo(console, &info)) {
-               return;
-       }
-       if (info.dwCursorPosition.Y == 0)
-               its_my_console = 1;
-}
-
-static void
-win_pre_exit(sts)
-       int sts;
-{
-       if (sts == 0)
-               return;
-       if (its_my_console <= 0)
-               return;
-       fprintf(stderr, "Hit any key to exit...");
-       fflush(stderr);
-       _getch();
-}
-
-#endif