summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2002-07-07 20:54:44 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2002-07-07 20:54:44 (GMT)
commit059ed83cc327d8f9404a160b7a5f9fb2c2b5b090 (patch)
tree38526dd545715a3cfac7458a1fab20da728c881a
parent4be93d0e848ca2dc55f119a7b0eb31fb995d7d33 (diff)
downloadcpython-059ed83cc327d8f9404a160b7a5f9fb2c2b5b090.zip
cpython-059ed83cc327d8f9404a160b7a5f9fb2c2b5b090.tar.gz
cpython-059ed83cc327d8f9404a160b7a5f9fb2c2b5b090.tar.bz2
- Got rid if WITH_CYCLE_GC
- Cleaned up Python banner string, so the normal build for MacPython 2.3 will have a short banner.
-rw-r--r--Mac/Include/pyconfig.h3
-rw-r--r--Mac/Modules/macconfig.c4
-rw-r--r--Mac/Python/macgetcompiler.c18
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