summaryrefslogtreecommitdiffstats
path: root/Mac/Python
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2001-01-16 15:54:58 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2001-01-16 15:54:58 (GMT)
commitc00df0bbba3c0c409aada5aba82cfede08778d81 (patch)
tree74af2fe46df2a00aab19f80d8f8d39fd9d2ad7b6 /Mac/Python
parentf50fbf11f6a647db619bd8b399f95d415a1aa428 (diff)
downloadcpython-c00df0bbba3c0c409aada5aba82cfede08778d81.zip
cpython-c00df0bbba3c0c409aada5aba82cfede08778d81.tar.gz
cpython-c00df0bbba3c0c409aada5aba82cfede08778d81.tar.bz2
Trigger keep-console-open on GUSISIOUX_STATE_UNKNOWN. Better than the previous complicated expression.
Diffstat (limited to 'Mac/Python')
-rw-r--r--Mac/Python/macmain.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Mac/Python/macmain.c b/Mac/Python/macmain.c
index e3df287..8dfbdaf 100644
--- a/Mac/Python/macmain.c
+++ b/Mac/Python/macmain.c
@@ -283,7 +283,7 @@ init_common(int *argcp, char ***argvp, int embedded)
} else {
/* Create argc/argv. Do it before we go into the options event loop. */
*argcp = PyMac_GetArgv(argvp, PyMac_options.noargs);
-#ifdef USE_ARGV0_CHDIR
+#ifndef NO_ARGV0_CHDIR
if (*argcp >= 1 && (*argvp)[0] && (*argvp)[0][0]) {
/* Workaround for MacOS X, which currently (DP4) doesn't set
** the working folder correctly
@@ -544,7 +544,7 @@ Py_Main(argc, argv)
void
PyMac_OutputSeen()
{
-#if defined(USE_GUSI) && !TARGET_API_MAC_CARBON_NOTYET
+#ifdef GUSISIOUX_STATE_UNKNOWN
gusisioux_state = GUSISIOUX_STATE_LASTREAD;
#endif
}
@@ -569,7 +569,7 @@ PyMac_Exit(status)
keep = 0;
break;
case POPT_KEEPCONSOLE_OUTPUT:
-#if defined(USE_GUSI) && !TARGET_API_MAC_CARBON_NOTYET
+#ifdef GUSISIOUX_STATE_UNKNOWN
if (gusisioux_state == GUSISIOUX_STATE_LASTWRITE ||
gusisioux_state == GUSISIOUX_STATE_UNKNOWN )
keep = 1;