Don't use our own malloc any more. It made test_longexp crash due to its optimization...

diff --git a/Mac/mwerks/mwerks_applet_config.h b/Mac/mwerks/mwerks_applet_config.h
index 3e54034dfda907d7cdd425cdcb8cced5e37d7009..fc332f80d066d8c6adc5cb773ae491f897dab629 100644 (file)
--- a/Mac/mwerks/mwerks_applet_config.h
+++ b/Mac/mwerks/mwerks_applet_config.h
@@ -19,14 +19,19 @@
 #define MAC_TCL                        /* This *must* be on if USE_TK is on */
 /* #define USE_MAC_SHARED_LIBRARY      /* Enable code to add shared-library resources */
 #define USE_MAC_APPLET_SUPPORT /* Enable code to run a PYC resource */
-/* #define USE_MAC_DYNAMIC_LOADING             /* Enable dynamically loaded modules */
 /* #define USE_MALLOC_DEBUG                    /* Enable range checking and other malloc debugging */
 #define USE_GDBM               /* Include the gdbm module */
 #define USE_ZLIB               /* Include the zlib 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 */
 #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 */
 #include <ansi_prefix.mac.h>

diff --git a/Mac/mwerks/mwerks_carbon_config.h b/Mac/mwerks/mwerks_carbon_config.h
index b39467e302b241d4a7655ccc3df4a6dde15c230e..e886d3697641e8199545ec96fe0225de5a76c720 100644 (file)
--- a/Mac/mwerks/mwerks_carbon_config.h
+++ b/Mac/mwerks/mwerks_carbon_config.h
@@ -27,15 +27,19 @@
 /* #define USE_MAC_SHARED_LIBRARY      /* Enable code to add shared-library resources */
 /* #define USE_MAC_APPLET_SUPPORT      /* Enable code to run a PYC resource */
 /* #define HAVE_DYNAMIC_LOADING                /* Enable dynamically loaded modules */
-/* #define USE_MALLOC_DEBUG                    /* Enable range checking and other malloc debugging */
 /* #define USE_GDBM            /* Include the gdbm module */
 /* #define USE_ZLIB            /* Include the zlib module */
 #define USE_UCNHASH            /* Include ucnhash module */
 #define USE_APPEARANCE /* Enable Appearance support */
-#define USE_MSL_MALLOC /* Use MSL malloc(), not our own. */
+
+#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 */
 #include <ansi_prefix.mac.h>

diff --git a/Mac/mwerks/mwerks_nonshared_config.h b/Mac/mwerks/mwerks_nonshared_config.h
index acae953364a66849ad1a8e091fb77f0afabd41bf..797d52619b1372593b45f57b3fc47199db93e71b 100644 (file)
--- a/Mac/mwerks/mwerks_nonshared_config.h
+++ b/Mac/mwerks/mwerks_nonshared_config.h
@@ -19,13 +19,18 @@
 /* #define USE_MAC_SHARED_LIBRARY      /* Enable code to add shared-library resources */
 /* #define USE_MAC_APPLET_SUPPORT      /* Enable code to run a PYC resource */
 /* #define HAVE_DYNAMIC_LOADING                /* Enable dynamically loaded modules */
-/* #define USE_MALLOC_DEBUG                    /* Enable range checking and other malloc debugging */
 #define USE_GDBM               /* Include the gdbm module */
 #define USE_ZLIB               /* Include the zlib 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 */
 #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 */
 #include <ansi_prefix.mac.h>

diff --git a/Mac/mwerks/mwerks_shared_config.h b/Mac/mwerks/mwerks_shared_config.h
index 67cc9d7f0ba426221585307e3a39d66ef50e766a..36272a478a006c154dd1852b940788c60cd69742 100644 (file)
--- a/Mac/mwerks/mwerks_shared_config.h
+++ b/Mac/mwerks/mwerks_shared_config.h
@@ -24,13 +24,18 @@
 #define USE_MAC_SHARED_LIBRARY         /* Enable code to add shared-library resources */
 #define USE_MAC_APPLET_SUPPORT         /* Enable code to run a PYC resource */
 #define HAVE_DYNAMIC_LOADING           /* Enable dynamically loaded modules */
-/* #define USE_MALLOC_DEBUG                    /* Enable range checking and other malloc debugging */
 /* #define USE_GDBM            /* Include the gdbm module */
 /* #define USE_ZLIB            /* Include the zlib 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 */
 #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 */
 #include <ansi_prefix.mac.h>

diff --git a/Mac/mwerks/mwerks_small_config.h b/Mac/mwerks/mwerks_small_config.h
index 5b99aa5dbec7c7fc4f4e4426409c8d84c4d3b80c..53554138cc4d34db1e211e8446c53eb569a49e72 100644 (file)
--- a/Mac/mwerks/mwerks_small_config.h
+++ b/Mac/mwerks/mwerks_small_config.h
@@ -21,14 +21,19 @@
 /* #define USE_MAC_SHARED_LIBRARY      /* Enable code to add shared-library resources */
 /* #define USE_MAC_APPLET_SUPPORT      /* Enable code to run a PYC resource */
 /* #define HAVE_DYNAMIC_LOADING                /* Enable dynamically loaded modules */
-/* #define USE_MALLOC_DEBUG                    /* Enable range checking and other malloc debugging */
 /* #define USE_GDBM            /* Include the gdbm module */
 /* #define USE_ZLIB            /* Include the zlib module */
 #define USE_UCNHASH    /* Include the ucnhash 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 */
 #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 */
 #include <ansi_prefix.mac.h>

diff --git a/Mac/mwerks/mwerks_threadsmall_config.h b/Mac/mwerks/mwerks_threadsmall_config.h
index 70a11a0ab5ce4c7a3e41992f4990869889708229..223039eb218e6fc0d441aceaea9985871c2e5a55 100644 (file)
--- a/Mac/mwerks/mwerks_threadsmall_config.h
+++ b/Mac/mwerks/mwerks_threadsmall_config.h
@@ -22,13 +22,18 @@
 /* #define USE_MAC_SHARED_LIBRARY      /* Enable code to add shared-library resources */
 /* #define USE_MAC_APPLET_SUPPORT      /* Enable code to run a PYC resource */
 /* #define HAVE_DYNAMIC_LOADING                /* Enable dynamically loaded modules */
-#define USE_MALLOC_DEBUG                       /* Enable range checking and other malloc debugging */
 /* #define USE_GDBM            /* Include the gdbm module */
 /* #define USE_ZLIB            /* Include the zlib 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 */
 #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 */
 #include <ansi_prefix.mac.h>