Started on GUSI2 and threading support.
diff --git a/Mac/Python/macmain.c b/Mac/Python/macmain.c
index db39e18..98298c8 100644
--- a/Mac/Python/macmain.c
+++ b/Mac/Python/macmain.c
@@ -225,13 +225,15 @@
 	PyMac_AddLibResources();
 #endif
 
-#if defined(USE_GUSI)
+#if defined(USE_GUSI1)
 	/* Setup GUSI */
 	GUSIDefaultSetup();
 	PyMac_SetGUSISpin();
 	PyMac_SetGUSIOptions();
-	atexit(PyMac_StopGUSISpin);
 #endif
+#if defined(USE_GUSI)
+	atexit(PyMac_StopGUSISpin);
+#endif	
 
 #ifdef USE_SIOUX
 	/* Set various SIOUX flags. Some are changed later based on options */
@@ -405,7 +407,7 @@
 			*endp = '\0';
 
 			chdir(curwd);
-#ifdef USE_GUSI
+#ifdef USE_GUSI1
 			/* Change MacOS's idea of wd too */
 			PyMac_FixGUSIcd();
 #endif