Got rid of obsolete defines.

diff --git a/Mac/mwerks/mwerks_carbon_config.h b/Mac/mwerks/mwerks_carbon_config.h
index bebdfe1d4ad29305ae955e38a4bc6f2e42b2c215..f3c8de997f30d4195e3adbbd3e6cbdc14cf2ccc9 100644 (file)
--- a/Mac/mwerks/mwerks_carbon_config.h
+++ b/Mac/mwerks/mwerks_carbon_config.h
@@ -8,9 +8,7 @@
 #define OPAQUE_TOOLBOX_STRUCTS 1
 #define TARGET_API_MAC_CARBON 1
 
-#define USE_ARGV0_CHDIR                /* Workaround for OSXDP4: change dir to argv[0] dir */
 #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_CORE_TOOLBOX            /* Include minimal set of toolbox modules in core Python */
@@ -28,13 +26,11 @@
 /* #define HAVE_DYNAMIC_LOADING                /* Enable dynamically loaded modules */
 /* #define USE_GDBM            /* Include the gdbm module */
 /* #define USE_ZLIB            /* Include the zlib module */
-#define USE_APPEARANCE /* Enable Appearance support */
 #define WITH_HOTSHOT   /* Enable hotshot profiler */
 
 #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
 #ifndef USE_MSL_MALLOC
 /* #define USE_MALLOC_DEBUG                    /* Enable range checking and other malloc debugging */
-#define USE_CACHE_ALIGNED 8            /* Align on 32-byte boundaries for 604 */
 #endif
 #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
 

diff --git a/Mac/mwerks/mwerks_carbonplugin_config.h b/Mac/mwerks/mwerks_carbonplugin_config.h
index 6a10716dccea8f2800c18b6b52890fd8b8049004..f28cfd3c8c581f301a54a8d5bacb6cbfd3c0dff6 100644 (file)
--- a/Mac/mwerks/mwerks_carbonplugin_config.h
+++ b/Mac/mwerks/mwerks_carbonplugin_config.h
@@ -7,11 +7,8 @@
 #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
 #define USE_TOOLBOX_OBJECT_GLUE        /* Use glue routines for accessing PyArg_Parse/Py_BuildValue helpers */
 
-/* #define USE_GUSI1           /* Stdio implemented with GUSI */
 #define USE_GUSI2              /* Stdio implemented with GUSI */
-#if defined(USE_GUSI1) || defined(USE_GUSI2)
 #define USE_GUSI
-#endif
 #define WITH_THREAD            /* Use thread support (needs GUSI 2, not GUSI 1) */
 #define USE_MSL                        /* Use MSL libraries */
 #ifdef USE_MSL

diff --git a/Mac/mwerks/mwerks_nonshared_config.h b/Mac/mwerks/mwerks_nonshared_config.h
index 64f9a482251387bdbbca986c8fa18e3695202957..4c1196d80fa5aa57bf36e662b1f4141e808f423f 100644 (file)
--- a/Mac/mwerks/mwerks_nonshared_config.h
+++ b/Mac/mwerks/mwerks_nonshared_config.h
@@ -5,11 +5,8 @@
 ** specific features, you may also need different sets of sources.
 */
 
-/* #define USE_GUSI1           /* Stdio implemented with GUSI */
 #define USE_GUSI2              /* Stdio implemented with GUSI 2 */
-#if defined(USE_GUSI1) || defined(USE_GUSI2)
 #define USE_GUSI
-#endif
 #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 */
@@ -26,11 +23,9 @@
 #define USE_ZLIB               /* Include the zlib module */
 #define USE_IC                 /* Include Internet Config module */
 #define USE_PYEXPAT            /* Include Pyexpat module */
-#define USE_APPEARANCE /* Enable Appearance support */
 #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
 #ifndef USE_MSL_MALLOC
 /* #define USE_MALLOC_DEBUG                    /* Enable range checking and other malloc debugging */
-#define USE_CACHE_ALIGNED 8            /* Align on 32-byte boundaries for 604 */
 #endif
 #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
 

diff --git a/Mac/mwerks/mwerks_nscarbon_config.h b/Mac/mwerks/mwerks_nscarbon_config.h
index 58a5a9b7fe28e317317ecdff4961bdb53cb81d1c..2e7e1f992030486b85df207facc70d3c7b6e99ee 100644 (file)
--- a/Mac/mwerks/mwerks_nscarbon_config.h
+++ b/Mac/mwerks/mwerks_nscarbon_config.h
@@ -8,11 +8,8 @@
 #define OPAQUE_TOOLBOX_STRUCTS 1
 #define TARGET_API_MAC_CARBON 1
 
-#define USE_ARGV0_CHDIR                /* Workaround for OSXDP4: change dir to argv[0] dir */
 #define USE_GUSI2              /* Stdio implemented with GUSI 2 */
-#if defined(USE_GUSI1) || defined(USE_GUSI2)
 #define USE_GUSI
-#endif
 /* #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 */
@@ -30,11 +27,9 @@
 #define USE_ZLIB               /* Include the zlib module */
 #define USE_IC                 /* Include Internet Config module */
 #define USE_PYEXPAT            /* Include Pyexpat module */
-#define USE_APPEARANCE /* Enable Appearance support */
 #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
 #ifndef USE_MSL_MALLOC
 /* #define USE_MALLOC_DEBUG                    /* Enable range checking and other malloc debugging */
-#define USE_CACHE_ALIGNED 8            /* Align on 32-byte boundaries for 604 */
 #endif
 #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
 

diff --git a/Mac/mwerks/mwerks_plugin_config.h b/Mac/mwerks/mwerks_plugin_config.h
index 1413f44980f1a7d894a0e33b972e73a8e3ef2563..3822378d13fe238e5a9343faaefe061b1a694702 100644 (file)
--- a/Mac/mwerks/mwerks_plugin_config.h
+++ b/Mac/mwerks/mwerks_plugin_config.h
@@ -4,7 +4,7 @@
 
 /* #define USE_GUSI1           /* Stdio implemented with GUSI */
 #define USE_GUSI2              /* Stdio implemented with GUSI */
-#if defined(USE_GUSI1) || defined(USE_GUSI2)
+#if defined(USE_GUSI2)
 #define USE_GUSI
 #endif
 #define WITH_THREAD            /* Use thread support (needs GUSI 2, not GUSI 1) */

diff --git a/Mac/mwerks/mwerks_shared_config.h b/Mac/mwerks/mwerks_shared_config.h
index 414bedf03057dd632c520fe69cce9b50972cda65..4fcc83585ec7ce73c555e7b29d2b6ac1961355f1 100644 (file)
--- a/Mac/mwerks/mwerks_shared_config.h
+++ b/Mac/mwerks/mwerks_shared_config.h
@@ -6,7 +6,6 @@
 ** specific features, you may also need different sets of sources.
 */
 
-/* #define USE_GUSI1           /* Stdio implemented with GUSI */
 #define USE_GUSI2              /* Stdio implemented with GUSI */
 #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) */
@@ -26,14 +25,12 @@
 #define HAVE_DYNAMIC_LOADING           /* Enable dynamically loaded modules */
 /* #define USE_GDBM            /* Include the gdbm module */
 /* #define USE_ZLIB            /* Include the zlib module */
-#define USE_APPEARANCE /* Enable Appearance support */
 #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
 #define USE_TOOLBOX_OBJECT_GLUE /* Call toolbox object converters indirectly */
 
 #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
 #ifndef USE_MSL_MALLOC
 /* #define USE_MALLOC_DEBUG                    /* Enable range checking and other malloc debugging */
-#define USE_CACHE_ALIGNED 8            /* Align on 32-byte boundaries for 604 */
 #endif
 
 #ifdef USE_MSL

diff --git a/Mac/mwerks/mwerks_shcarbon_config.h b/Mac/mwerks/mwerks_shcarbon_config.h
index a9d3916e2a85ef940f49c01bbe3816d050fd27dd..0360d0935c0ea1342850128166f71870ff843aca 100644 (file)
--- a/Mac/mwerks/mwerks_shcarbon_config.h
+++ b/Mac/mwerks/mwerks_shcarbon_config.h
@@ -9,9 +9,7 @@
 #define OPAQUE_TOOLBOX_STRUCTS 1
 #define TARGET_API_MAC_CARBON 1
 
-#define USE_ARGV0_CHDIR                /* Workaround for OSXDP4: change dir to argv[0] dir */
 #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_CORE_TOOLBOX    /* Include core toolbox modules (Dlg,Ctl,Menu,Win,Res,Qd) */
@@ -30,14 +28,12 @@
 #define HAVE_DYNAMIC_LOADING           /* Enable dynamically loaded modules */
 /* #define USE_GDBM            /* Include the gdbm module */
 /* #define USE_ZLIB            /* Include the zlib module */
-#define USE_APPEARANCE /* Enable Appearance support */
 #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
 #define USE_TOOLBOX_OBJECT_GLUE /* Call toolbox object converters indirectly */
 
 #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
 #ifndef USE_MSL_MALLOC
 /* #define USE_MALLOC_DEBUG                    /* Enable range checking and other malloc debugging */
-#define USE_CACHE_ALIGNED 8            /* Align on 32-byte boundaries for 604 */
 #endif
 
 #ifdef USE_MSL

diff --git a/Mac/mwerks/mwerks_small_config.h b/Mac/mwerks/mwerks_small_config.h
index 6d08f1bd67172a3062e1a946db255638a43b017f..603ab40dcf74fa24f3e55e35533ad52af4847eef 100644 (file)
--- a/Mac/mwerks/mwerks_small_config.h
+++ b/Mac/mwerks/mwerks_small_config.h
@@ -6,7 +6,6 @@
 */
 
 #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 */
@@ -23,14 +22,12 @@
 /* #define HAVE_DYNAMIC_LOADING                /* Enable dynamically loaded modules */
 /* #define USE_GDBM            /* Include the gdbm module */
 /* #define USE_ZLIB            /* Include the zlib module */
-#define USE_APPEARANCE /* Enable Appearance support */
 #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
 #define WITH_HOTSHOT   /* Enable hotshot profiler */
 
 #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
 #ifndef USE_MSL_MALLOC
 /* #define USE_MALLOC_DEBUG                    /* Enable range checking and other malloc debugging */
-#define USE_CACHE_ALIGNED 8            /* Align on 32-byte boundaries for 604 */
 #endif
 
 #ifdef USE_MSL

diff --git a/Mac/mwerks/mwerks_thrcarbonsm_config.h b/Mac/mwerks/mwerks_thrcarbonsm_config.h
index e52c373f32d9e0472feeedafe0edb9d444c5815e..958f1c6f08e787d15849560a3edbf93a42d3bebf 100644 (file)
--- a/Mac/mwerks/mwerks_thrcarbonsm_config.h
+++ b/Mac/mwerks/mwerks_thrcarbonsm_config.h
@@ -8,9 +8,7 @@
 #define OPAQUE_TOOLBOX_STRUCTS 1
 #define TARGET_API_MAC_CARBON 1
 
-#define USE_ARGV0_CHDIR                /* Workaround for OSXDP4: change dir to argv[0] dir */
 #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 */
@@ -29,13 +27,11 @@
 /* #define HAVE_DYNAMIC_LOADING                /* Enable dynamically loaded modules */
 /* #define USE_GDBM            /* Include the gdbm module */
 /* #define USE_ZLIB            /* Include the zlib module */
-#define USE_APPEARANCE /* Enable Appearance support */
 #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
 
 #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
 #ifndef USE_MSL_MALLOC
 /* #define USE_MALLOC_DEBUG                    /* Enable range checking and other malloc debugging */
-#define USE_CACHE_ALIGNED 8            /* Align on 32-byte boundaries for 604 */
 #endif
 
 #ifdef USE_MSL

diff --git a/Mac/mwerks/mwerks_threadsmall_config.h b/Mac/mwerks/mwerks_threadsmall_config.h
index 83c8a3e5bd5c770393be822d3a8040e98b7239bd..302a36a167cb7e8a9bd1db99d32b1559e17aee17 100644 (file)
--- a/Mac/mwerks/mwerks_threadsmall_config.h
+++ b/Mac/mwerks/mwerks_threadsmall_config.h
@@ -6,8 +6,7 @@
 */
 
 #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 WITH_THREAD            /* Use thread support */
 #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 */
@@ -24,13 +23,11 @@
 /* #define HAVE_DYNAMIC_LOADING                /* Enable dynamically loaded modules */
 /* #define USE_GDBM            /* Include the gdbm module */
 /* #define USE_ZLIB            /* Include the zlib module */
-#define USE_APPEARANCE /* Enable Appearance support */
 #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
 
 #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
 #ifndef USE_MSL_MALLOC
 /* #define USE_MALLOC_DEBUG                    /* Enable range checking and other malloc debugging */
-#define USE_CACHE_ALIGNED 8            /* Align on 32-byte boundaries for 604 */
 #endif
 
 #ifdef USE_MSL

diff --git a/Mac/mwerks/mwerks_tkplugin_config.h b/Mac/mwerks/mwerks_tkplugin_config.h
index aef32fbb5eb263bd0c0408c17fab809a225fe39a..f3b4e092162d69acfb701ae9f3d56f721f0ea73f 100644 (file)
--- a/Mac/mwerks/mwerks_tkplugin_config.h
+++ b/Mac/mwerks/mwerks_tkplugin_config.h
@@ -4,7 +4,7 @@
 
 #define USE_GUSI2              /* Stdio implemented with GUSI 2 */
 /* #define USE_GUSI1   /* Stdio implemented with GUSI 1.X */
-#if defined(USE_GUSI1) || defined(USE_GUSI2)
+#if defined(USE_GUSI2)
 #define USE_GUSI
 #endif
 #define WITH_THREAD            /* Use thread support (needs GUSI 2, not GUSI 1) */