From: Jack Jansen <jack.jansen@cwi.nl>
Date: Tue, 7 Aug 2001 15:14:53 +0000 (+0000)
Subject: Got rid of (hopefully) the last 68k Mac-related ifdefs and various other cruft.
X-Git-Tag: v2.2a3~782
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=596e18a666dd0609fefeef041c6d89e2b498f5ba;p=python

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 fe18963512..8f22320cc5 100644
--- 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 0d2fc7c89a..de94aa8f3b 100644
--- 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 abf205ffc6..fd4f09322a 100644
--- 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 fa6d3eaa5e..de3af4531c 100644
--- 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 db5dffc86e..279ea128ec 100644
--- 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 24e6129009..bf7fbe687e 100644
--- 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 573aba52f4..cdd8d8624d 100644
--- 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 6ea97e47c8..05fda97933 100644
--- 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 f4199efc37..0a64cad14f 100644
--- 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 */