From 059ed83cc327d8f9404a160b7a5f9fb2c2b5b090 Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Sun, 7 Jul 2002 20:54:44 +0000
Subject: - Got rid if WITH_CYCLE_GC - Cleaned up Python banner string, so the
 normal build for MacPython 2.3   will have a short banner.

---
 Mac/Include/pyconfig.h      |  3 ---
 Mac/Modules/macconfig.c     |  4 ----
 Mac/Python/macgetcompiler.c | 18 ++++++------------
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/Mac/Include/pyconfig.h b/Mac/Include/pyconfig.h
index 38542d7..0a01c96 100644
--- a/Mac/Include/pyconfig.h
+++ b/Mac/Include/pyconfig.h
@@ -283,9 +283,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
    one supplied by Python itself. (see Include/unicodectype.h). */
 #undef WANT_WCTYPE_FUNCTIONS
 
-/* Define if you want to compile in cycle garbage collection */
-#define WITH_CYCLE_GC 1
-
 /* Define if you want cross-platform newline support for reading */
 #define WITH_UNIVERSAL_NEWLINES
 
diff --git a/Mac/Modules/macconfig.c b/Mac/Modules/macconfig.c
index 4bae69f..b445400 100644
--- a/Mac/Modules/macconfig.c
+++ b/Mac/Modules/macconfig.c
@@ -163,9 +163,7 @@ extern void init_hotshot();
 #ifdef USE_PYEXPAT
 extern void initpyexpat();
 #endif
-#ifdef WITH_CYCLE_GC
 extern void initgc();
-#endif
 
 extern void initcPickle();
 extern void initcStringIO();
@@ -295,9 +293,7 @@ struct _inittab _PyImport_Inittab[] = {
 #ifdef USE_PYEXPAT
 	{"pyexpat", initpyexpat},
 #endif
-#ifdef WITH_CYCLE_GC
 	{"gc", initgc},
-#endif
 	{"cPickle",	initcPickle},
 	{"cStringIO",	initcStringIO},
 	{"_locale", init_locale},
diff --git a/Mac/Python/macgetcompiler.c b/Mac/Python/macgetcompiler.c
index 46c0bf3..a5c72fa 100644
--- a/Mac/Python/macgetcompiler.c
+++ b/Mac/Python/macgetcompiler.c
@@ -36,30 +36,24 @@ PERFORMANCE OF THIS SOFTWARE.
 
 #ifdef __MWERKS__
 #ifdef USE_GUSI2
-#define HASGUSI " GUSI2"
-#else
 #define HASGUSI ""
+#else
+#define HASGUSI " WITHOUT_GUSI2"
 #endif
 
 #ifdef WITH_THREAD
-#define HASTHREAD " THREADS"
-#else
 #define HASTHREAD ""
+#else
+#define HASTHREAD " WITHOUT_THREAD"
 #endif
 
 #if TARGET_API_MAC_CARBON
-#define TARGET_API " CARBON"
+#define TARGET_API ""
 #else
 #define TARGET_API " PPC"
 #endif
 
-#ifdef WITH_CYCLE_GC
-#define HASGC " GC"
-#else
-#define HASGC ""
-#endif
-
-#define COMPILER " [CW" TARGET_API HASGUSI HASTHREAD HASGC"]"
+#define COMPILER " [CW" TARGET_API HASGUSI HASTHREAD"]"
 #endif
 
 #ifdef MPW
-- 
cgit v0.12