Got rid of (hopefully) the last 68k Mac-related ifdefs and various other cruft.

diff --git a/Mac/mwerks/mwerks_carbon_config.h b/Mac/mwerks/mwerks_carbon_config.h
index fe18963512f51ae74fdc54491c36b962fd12d7d0..8f22320cc5627ed7bd9464d36ec174acee58d828 100644 (file)
--- a/Mac/mwerks/mwerks_carbon_config.h
+++ b/Mac/mwerks/mwerks_carbon_config.h
@@ -7,7 +7,6 @@
 #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
 #define OPAQUE_TOOLBOX_STRUCTS 1
 #define TARGET_API_MAC_CARBON 1
-#define TARGET_API_MAC_CARBON_NOTYET 1 /* Things we should do eventually, but not now */
 
 #define USE_ARGV0_CHDIR                /* Workaround for OSXDP4: change dir to argv[0] dir */
 #define USE_GUSI2              /* Stdio implemented with GUSI 2 */
@@ -34,10 +33,8 @@
 #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 */
-#ifdef __powerc
 #define USE_CACHE_ALIGNED 8            /* Align on 32-byte boundaries for 604 */
 #endif
-#endif
 #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
 
 #ifdef USE_MSL

diff --git a/Mac/mwerks/mwerks_carbonplugin_config.h b/Mac/mwerks/mwerks_carbonplugin_config.h
index 0d2fc7c89a22567c481dbc82a303309a3c2aff16..de94aa8f3b47249676361946ca596c42299be7f9 100644 (file)
--- a/Mac/mwerks/mwerks_carbonplugin_config.h
+++ b/Mac/mwerks/mwerks_carbonplugin_config.h
@@ -4,7 +4,6 @@
 #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
 #define OPAQUE_TOOLBOX_STRUCTS 1
 #define TARGET_API_MAC_CARBON 1
-#define TARGET_API_MAC_CARBON_NOTYET 1 /* Things we should do eventually, but not now */
 #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 */
 

diff --git a/Mac/mwerks/mwerks_nonshared_config.h b/Mac/mwerks/mwerks_nonshared_config.h
index abf205ffc6f7f3ce672a06e1a905377ef5249909..fd4f09322a72d12d4e8a8d60630c4cf2dbe09b25 100644 (file)
--- a/Mac/mwerks/mwerks_nonshared_config.h
+++ b/Mac/mwerks/mwerks_nonshared_config.h
@@ -30,10 +30,8 @@
 #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 */
-#ifdef __powerc
 #define USE_CACHE_ALIGNED 8            /* Align on 32-byte boundaries for 604 */
 #endif
-#endif
 #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
 
 #ifdef USE_MSL

diff --git a/Mac/mwerks/mwerks_nscarbon_config.h b/Mac/mwerks/mwerks_nscarbon_config.h
index fa6d3eaa5e81d8de93f0a1ad0647934a9c8ae24c..de3af4531c0130670fd8ff39e1a16b42848ca586 100644 (file)
--- a/Mac/mwerks/mwerks_nscarbon_config.h
+++ b/Mac/mwerks/mwerks_nscarbon_config.h
@@ -7,7 +7,6 @@
 #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
 #define OPAQUE_TOOLBOX_STRUCTS 1
 #define TARGET_API_MAC_CARBON 1
-#define TARGET_API_MAC_CARBON_NOTYET 1 /* Things we should do eventually, but not now */
 
 #define USE_ARGV0_CHDIR                /* Workaround for OSXDP4: change dir to argv[0] dir */
 #define USE_GUSI2              /* Stdio implemented with GUSI 2 */
@@ -35,10 +34,8 @@
 #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 */
-#ifdef __powerc
 #define USE_CACHE_ALIGNED 8            /* Align on 32-byte boundaries for 604 */
 #endif
-#endif
 #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
 
 #ifdef USE_MSL

diff --git a/Mac/mwerks/mwerks_shared_config.h b/Mac/mwerks/mwerks_shared_config.h
index db5dffc86ebbb31d929d10b22bdbaaa42184d2af..279ea128ec9a3df727b98b7c94284d85408d312d 100644 (file)
--- a/Mac/mwerks/mwerks_shared_config.h
+++ b/Mac/mwerks/mwerks_shared_config.h
@@ -33,10 +33,8 @@
 #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 */
-#ifdef __powerc
 #define USE_CACHE_ALIGNED 8            /* Align on 32-byte boundaries for 604 */
 #endif
-#endif
 
 #ifdef USE_MSL
 #define MSL_USE_PRECOMPILED_HEADERS 0  /* Don't use precomp headers: we include our own */

diff --git a/Mac/mwerks/mwerks_shcarbon_config.h b/Mac/mwerks/mwerks_shcarbon_config.h
index 24e6129009c34d8420acc0b45f5a9c186dfafa7b..bf7fbe687e3635d5ae47284bf502d52072ecc761 100644 (file)
--- a/Mac/mwerks/mwerks_shcarbon_config.h
+++ b/Mac/mwerks/mwerks_shcarbon_config.h
@@ -8,7 +8,6 @@
 #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
 #define OPAQUE_TOOLBOX_STRUCTS 1
 #define TARGET_API_MAC_CARBON 1
-#define TARGET_API_MAC_CARBON_NOTYET 1 /* Things we should do eventually, but not now */
 
 #define USE_ARGV0_CHDIR                /* Workaround for OSXDP4: change dir to argv[0] dir */
 #define USE_GUSI2              /* Stdio implemented with GUSI 2 */
@@ -38,10 +37,8 @@
 #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 */
-#ifdef __powerc
 #define USE_CACHE_ALIGNED 8            /* Align on 32-byte boundaries for 604 */
 #endif
-#endif
 
 #ifdef USE_MSL
 #define MSL_USE_PRECOMPILED_HEADERS 0  /* Don't use precomp headers: we include our own */

diff --git a/Mac/mwerks/mwerks_small_config.h b/Mac/mwerks/mwerks_small_config.h
index 573aba52f463cdbe5e292e52ac16c5cc958d509c..cdd8d8624dcd7311510e203ec01dfe5a1f302294 100644 (file)
--- a/Mac/mwerks/mwerks_small_config.h
+++ b/Mac/mwerks/mwerks_small_config.h
@@ -29,10 +29,8 @@
 #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 */
-#ifdef __powerc
 #define USE_CACHE_ALIGNED 8            /* Align on 32-byte boundaries for 604 */
 #endif
-#endif
 
 #ifdef USE_MSL
 #define MSL_USE_PRECOMPILED_HEADERS 0  /* Don't use precomp headers: we include our own */

diff --git a/Mac/mwerks/mwerks_thrcarbonsm_config.h b/Mac/mwerks/mwerks_thrcarbonsm_config.h
index 6ea97e47c8994b56b08f8dd3432a0a7d077d06f8..05fda979332ea96540a6a26568e7a5b8b0d33c68 100644 (file)
--- a/Mac/mwerks/mwerks_thrcarbonsm_config.h
+++ b/Mac/mwerks/mwerks_thrcarbonsm_config.h
@@ -7,7 +7,6 @@
 #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
 #define OPAQUE_TOOLBOX_STRUCTS 1
 #define TARGET_API_MAC_CARBON 1
-#define TARGET_API_MAC_CARBON_NOTYET 1 /* Things we should do eventually, but not now */
 
 #define USE_ARGV0_CHDIR                /* Workaround for OSXDP4: change dir to argv[0] dir */
 #define USE_GUSI2              /* Stdio implemented with GUSI 2 */
@@ -36,10 +35,8 @@
 #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 */
-#ifdef __powerc
 #define USE_CACHE_ALIGNED 8            /* Align on 32-byte boundaries for 604 */
 #endif
-#endif
 
 #ifdef USE_MSL
 #define MSL_USE_PRECOMPILED_HEADERS 0  /* Don't use precomp headers: we include our own */

diff --git a/Mac/mwerks/mwerks_threadsmall_config.h b/Mac/mwerks/mwerks_threadsmall_config.h
index f4199efc37925cdb5e8a911a5f1ce3cc19fb987b..0a64cad14f9e8775308aa4237cf111d3f58aa9a2 100644 (file)
--- a/Mac/mwerks/mwerks_threadsmall_config.h
+++ b/Mac/mwerks/mwerks_threadsmall_config.h
@@ -30,10 +30,8 @@
 #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 */
-#ifdef __powerc
 #define USE_CACHE_ALIGNED 8            /* Align on 32-byte boundaries for 604 */
 #endif
-#endif
 
 #ifdef USE_MSL
 #define MSL_USE_PRECOMPILED_HEADERS 0  /* Don't use precomp headers: we include our own */