8 files changed, 48 insertions, 6 deletions
diff --git a/Mac/mwerks/errno_unix.h b/Mac/mwerks/errno_unix.h
index 7f63ef6..2e6f171 100644
--- a/Mac/mwerks/errno_unix.h
+++ b/Mac/mwerks/errno_unix.h
@@ -29,6 +29,7 @@ PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
 
+#ifndef USE_GUSI2
 #define ENOTDIR		(-120)
 #ifndef __MSL__
 #define EACCES		(-54)
@@ -40,6 +41,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #define ENFILE		(-42)
 #define	EIO			(-36)
 #define ENOSPC		(-34)
+#endif
 
 #define ESRCH		3
 #define EINTR		4
diff --git a/Mac/mwerks/mwerks_nonshared_config.h b/Mac/mwerks/mwerks_nonshared_config.h
index e4bb1c8..e3d97ec 100644
--- a/Mac/mwerks/mwerks_nonshared_config.h
+++ b/Mac/mwerks/mwerks_nonshared_config.h
@@ -5,7 +5,8 @@
 ** specific features, you may also need different sets of sources.
 */
 
-#define USE_GUSI		/* Stdio implemented with GUSI */
+#define USE_GUSI1		/* Stdio implemented with GUSI */
+/* #define USE_GUSI2		/* Stdio implemented with GUSI 2 */
 #define USE_MSL			/* Use Mw Standard Library (as opposed to Plaugher C libraries) */
 #define USE_TOOLBOX		/* Include toolbox modules in core Python */
 #define USE_QT			/* Include quicktime modules in core Python */
diff --git a/Mac/mwerks/mwerks_plugin_config.h b/Mac/mwerks/mwerks_plugin_config.h
index 0052df8..1bb465d 100644
--- a/Mac/mwerks/mwerks_plugin_config.h
+++ b/Mac/mwerks/mwerks_plugin_config.h
@@ -2,7 +2,8 @@
 ** Config file for dynamically-loaded ppc/cfm68k plugin modules.
 */
 
-#define USE_GUSI		/* Stdio implemented with GUSI */
+#define USE_GUSI1		/* Stdio implemented with GUSI */
+/* #define USE_GUSI2		/* Stdio implemented with GUSI */
 #define USE_MSL			/* Use MSL libraries */
 #ifdef USE_MSL
 #define MSL_USE_PRECOMPILED_HEADERS 0	/* Don't use precomp headers: we include our own */
diff --git a/Mac/mwerks/mwerks_shared_config.h b/Mac/mwerks/mwerks_shared_config.h
index 4662d9b..66174b5 100644
--- a/Mac/mwerks/mwerks_shared_config.h
+++ b/Mac/mwerks/mwerks_shared_config.h
@@ -6,7 +6,8 @@
 ** specific features, you may also need different sets of sources.
 */
 
-#define USE_GUSI		/* Stdio implemented with GUSI */
+/* #define USE_GUSI1		/* Stdio implemented with GUSI */
+#define USE_GUSI2		/* Stdio implemented with GUSI */
 #define USE_MSL			/* Use Mw Standard Library (as opposed to Plaugher C libraries) */
 #define USE_CORE_TOOLBOX	/* Include core toolbox modules (Dlg,Ctl,Menu,Win,Res,Qd) */
 /* #define USE_TOOLBOX		/* Include all toolbox modules in core Python */
diff --git a/Mac/mwerks/mwerks_small_config.h b/Mac/mwerks/mwerks_small_config.h
index 762ef8f..771565b 100644
--- a/Mac/mwerks/mwerks_small_config.h
+++ b/Mac/mwerks/mwerks_small_config.h
@@ -5,7 +5,8 @@
 ** specific features, you may also need different sets of sources.
 */
 
-#define USE_GUSI		/* Stdio implemented with GUSI */
+#define USE_GUSI2		/* Stdio implemented with GUSI 2 */
+/* # define USE_GUSI1	/* Stdio implemented with GUSI 1 */
 #define USE_MSL			/* Use Mw Standard Library (as opposed to Plaugher C libraries) */
 #define USE_TOOLBOX		/* Include toolbox modules in core Python */
 #define USE_QT			/* Include quicktime modules in core Python */
@@ -20,7 +21,7 @@
 /* #define USE_MAC_SHARED_LIBRARY	/* Enable code to add shared-library resources */
 /* #define USE_MAC_APPLET_SUPPORT	/* Enable code to run a PYC resource */
 /* #define HAVE_DYNAMIC_LOADING		/* Enable dynamically loaded modules */
-#define USE_MALLOC_DEBUG			/* Enable range checking and other malloc debugging */
+/* #define USE_MALLOC_DEBUG			/* Enable range checking and other malloc debugging */
 /* #define USE_GDBM		/* Include the gdbm module */
 /* #define USE_ZLIB		/* Include the zlib module */
 #define USE_APPEARANCE	/* Enable Appearance support */
diff --git a/Mac/mwerks/mwerks_threadsmall_config.h b/Mac/mwerks/mwerks_threadsmall_config.h
new file mode 100644
index 0000000..70a11a0
--- /dev/null
+++ b/Mac/mwerks/mwerks_threadsmall_config.h
@@ -0,0 +1,35 @@
+/*
+** Configuration file for small standalone 68k/ppc Python.
+**
+** Note: enabling the switches below is not enough to enable the
+** specific features, you may also need different sets of sources.
+*/
+
+#define USE_GUSI2		/* Stdio implemented with GUSI 2 */
+/* # define USE_GUSI1	/* Stdio implemented with GUSI 1 */
+#define WITH_THREAD		/* Use thread support (needs GUSI 2, not GUSI 1) */
+#define USE_MSL			/* Use Mw Standard Library (as opposed to Plaugher C libraries) */
+#define USE_TOOLBOX		/* Include toolbox modules in core Python */
+#define USE_QT			/* Include quicktime modules in core Python */
+/* #define USE_WASTE		/* Include waste module in core Python */
+#define USE_MACSPEECH		/* Include macspeech module in core Python */
+/* #define USE_IMG	       	/* Include img modules in core Python */
+#define USE_MACCTB		/* Include ctb module in core Python */
+/* #define USE_STDWIN		/* Include stdwin module in core Python */
+/* #define USE_MACTCP		/* Include mactcp (*not* socket) modules in core */
+/* #define USE_TK			/* Include _tkinter module in core Python */
+/* #define MAC_TCL			/* This *must* be on if USE_TK is on */
+/* #define USE_MAC_SHARED_LIBRARY	/* Enable code to add shared-library resources */
+/* #define USE_MAC_APPLET_SUPPORT	/* Enable code to run a PYC resource */
+/* #define HAVE_DYNAMIC_LOADING		/* Enable dynamically loaded modules */
+#define USE_MALLOC_DEBUG			/* Enable range checking and other malloc debugging */
+/* #define USE_GDBM		/* Include the gdbm module */
+/* #define USE_ZLIB		/* Include the zlib module */
+#define USE_APPEARANCE	/* Enable Appearance support */
+#ifdef __powerc
+#define USE_CACHE_ALIGNED 8		/* Align on 32-byte boundaries for 604 */
+#endif
+#ifdef USE_MSL
+#define MSL_USE_PRECOMPILED_HEADERS 0	/* Don't use precomp headers: we include our own */
+#include <ansi_prefix.mac.h>
+#endif
diff --git a/Mac/mwerks/mwerks_tkplugin_config.h b/Mac/mwerks/mwerks_tkplugin_config.h
index 4b9fdc8..88b7552 100644
--- a/Mac/mwerks/mwerks_tkplugin_config.h
+++ b/Mac/mwerks/mwerks_tkplugin_config.h
@@ -2,6 +2,7 @@
 ** Special config-file for _tkinter plugin.
 */
 
-#define USE_GUSI		/* Stdio implemented with GUSI */
+#define USE_GUSI1		/* Stdio implemented with GUSI */
+/* #define USE_GUSI2		/* Stdio implemented with GUSI */
 #define USE_TK			/* Include _tkinter module in core Python */
 #define MAC_TCL			/* This *must* be on if USE_TK is on */
diff --git a/Mac/mwerks/projects/build.macfreeze/frozenbundle.rsrc b/Mac/mwerks/projects/build.macfreeze/frozenbundle.rsrc
index b219a42..fa2c02a 100644
--- a/Mac/mwerks/projects/build.macfreeze/frozenbundle.rsrc
+++ b/Mac/mwerks/projects/build.macfreeze/frozenbundle.rsrc