diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 1997-05-23 15:35:14 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 1997-05-23 15:35:14 (GMT) |
| commit | a39f1b0ce293652874cb70529cd3c92c919f3210 (patch) | |
| tree | 6d65d42910a000ed660b6a06c9f1eea244eea642 /Mac/Python/macmain.c | |
| parent | 570e4b7ad12031745316c019247c577b5f143b22 (diff) | |
| download | cpython-a39f1b0ce293652874cb70529cd3c92c919f3210.zip cpython-a39f1b0ce293652874cb70529cd3c92c919f3210.tar.gz cpython-a39f1b0ce293652874cb70529cd3c92c919f3210.tar.bz2 | |
- Added Py_GetProgramFullPath
- Added PyMac_StopGUSISpin and have it called at exit time (fixes crash
when exiting with sockets open)
- Added PLstr... funcs needed by gusi: those provided by StdCLib are
broken under cfm68k
Diffstat (limited to 'Mac/Python/macmain.c')
| -rw-r--r-- | Mac/Python/macmain.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Mac/Python/macmain.c b/Mac/Python/macmain.c index 9e8fbc5..811258a 100644 --- a/Mac/Python/macmain.c +++ b/Mac/Python/macmain.c @@ -209,6 +209,7 @@ init_common(int *argcp, char ***argvp, int embedded) GUSIDefaultSetup(); PyMac_SetGUSISpin(); PyMac_SetGUSIOptions(); + atexit(PyMac_StopGUSISpin); #endif #ifdef USE_SIOUX @@ -464,13 +465,6 @@ PyMac_Exit(status) } else SIOUXSettings.autocloseonquit = 1; -#ifdef USE_GUSI - /* - ** Workaround for Sioux/GUSI combo: we should not call - ** SiouxHandleOneEvent after the window is closed - */ - PyMac_ConsoleIsDead = 1; -#endif /* USE_GUSI */ #endif /* USE_SIOUX */ #ifdef THINK_C console_options.pause_atexit = keep; @@ -487,6 +481,13 @@ Py_GetProgramName() return orig_argv[0]; } +/* The same, but used differently */ +char * +Py_GetProgramFullPath() +{ + return Py_GetProgramName(); +} + /* Make the *original* argc/argv available to other modules. This is rare, but it is needed by the secureware extension. */ |