Added a WITHOUT_FRAMEWORKS define to all the config files, so that on MacOS<=9 compil...

diff --git a/Mac/mwerks/mwerks_applet_config.h b/Mac/mwerks/mwerks_applet_config.h
index fc332f80d066d8c6adc5cb773ae491f897dab629..b3fe7cdcc9ae7fb1cde6d911770b6a47d1c1ac07 100644 (file)
--- a/Mac/mwerks/mwerks_applet_config.h
+++ b/Mac/mwerks/mwerks_applet_config.h
@@ -23,6 +23,7 @@
 #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

diff --git a/Mac/mwerks/mwerks_carbonNOGUSI_config.h b/Mac/mwerks/mwerks_carbonNOGUSI_config.h
index 62ca906790a3600512cb61e56cde96c51125a63d..396153531a9a7d25124c39cf27818cb8b69d32c4 100644 (file)
--- a/Mac/mwerks/mwerks_carbonNOGUSI_config.h
+++ b/Mac/mwerks/mwerks_carbonNOGUSI_config.h
@@ -30,6 +30,7 @@
 /* #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

diff --git a/Mac/mwerks/mwerks_carbon_config.h b/Mac/mwerks/mwerks_carbon_config.h
index 5c59922799720b099809c04a65a7c48069e72613..fe18963512f51ae74fdc54491c36b962fd12d7d0 100644 (file)
--- a/Mac/mwerks/mwerks_carbon_config.h
+++ b/Mac/mwerks/mwerks_carbon_config.h
@@ -38,6 +38,7 @@
 #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
 #define MSL_USE_PRECOMPILED_HEADERS 0  /* Don't use precomp headers: we include our own */

diff --git a/Mac/mwerks/mwerks_carbongusi_config.h b/Mac/mwerks/mwerks_carbongusi_config.h
index e14d953fc5e7d0eb69f3cc59938c4da35b1b93b1..9a4e5b6a6daa078c947708b5353c8f0a6b3b34a7 100644 (file)
--- a/Mac/mwerks/mwerks_carbongusi_config.h
+++ b/Mac/mwerks/mwerks_carbongusi_config.h
@@ -29,6 +29,7 @@
 /* #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

diff --git a/Mac/mwerks/mwerks_carbonplugin_config.h b/Mac/mwerks/mwerks_carbonplugin_config.h
index 0d5429ace9a392c2ffeeb6aadffe32722c656c3c..7c949c9460cc66930ddd09aa2e185c192f398a84 100644 (file)
--- a/Mac/mwerks/mwerks_carbonplugin_config.h
+++ b/Mac/mwerks/mwerks_carbonplugin_config.h
@@ -5,6 +5,7 @@
 #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_GUSI1           /* Stdio implemented with GUSI */
 #define USE_GUSI2              /* Stdio implemented with GUSI */

diff --git a/Mac/mwerks/mwerks_nonshared_config.h b/Mac/mwerks/mwerks_nonshared_config.h
index 413d2411e1762347c33da2bb7b64716385ba0548..abf205ffc6f7f3ce672a06e1a905377ef5249909 100644 (file)
--- a/Mac/mwerks/mwerks_nonshared_config.h
+++ b/Mac/mwerks/mwerks_nonshared_config.h
@@ -34,6 +34,7 @@
 #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
 #define MSL_USE_PRECOMPILED_HEADERS 0  /* Don't use precomp headers: we include our own */

diff --git a/Mac/mwerks/mwerks_nscarbon_config.h b/Mac/mwerks/mwerks_nscarbon_config.h
index 6a4307a797a49e3627955baac747ed0214dd65da..fa6d3eaa5e81d8de93f0a1ad0647934a9c8ae24c 100644 (file)
--- a/Mac/mwerks/mwerks_nscarbon_config.h
+++ b/Mac/mwerks/mwerks_nscarbon_config.h
@@ -39,6 +39,7 @@
 #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
 #define MSL_USE_PRECOMPILED_HEADERS 0  /* Don't use precomp headers: we include our own */

diff --git a/Mac/mwerks/mwerks_plugin_config.h b/Mac/mwerks/mwerks_plugin_config.h
index 785883a31d86f8b9cf092124828189b0ffdbda58..27717d05efbf8962ff645efdff7a10752d534f64 100644 (file)
--- a/Mac/mwerks/mwerks_plugin_config.h
+++ b/Mac/mwerks/mwerks_plugin_config.h
@@ -8,6 +8,7 @@
 #define USE_GUSI
 #endif
 #define WITH_THREAD            /* Use thread support (needs GUSI 2, not GUSI 1) */
+#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
 #define USE_MSL                        /* Use MSL libraries */
 #ifdef USE_MSL
 #define MSL_USE_PRECOMPILED_HEADERS 0  /* Don't use precomp headers: we include our own */

diff --git a/Mac/mwerks/mwerks_shared_config.h b/Mac/mwerks/mwerks_shared_config.h
index 36272a478a006c154dd1852b940788c60cd69742..afd7210b4490f02c6d1dc42f8dfaf08b08260f83 100644 (file)
--- a/Mac/mwerks/mwerks_shared_config.h
+++ b/Mac/mwerks/mwerks_shared_config.h
@@ -27,6 +27,7 @@
 /* #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

diff --git a/Mac/mwerks/mwerks_shcarbon_config.h b/Mac/mwerks/mwerks_shcarbon_config.h
index 75ffeefbc95c1dc042140c9e3202264e75165b08..ec4e5c438c22d6acfcb3f13aa0999238d9a66e6f 100644 (file)
--- a/Mac/mwerks/mwerks_shcarbon_config.h
+++ b/Mac/mwerks/mwerks_shcarbon_config.h
@@ -32,6 +32,7 @@
 /* #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

diff --git a/Mac/mwerks/mwerks_small_config.h b/Mac/mwerks/mwerks_small_config.h
index 99d552fff6dfe46ffd7cad35fb9c26eb6888410f..573aba52f463cdbe5e292e52ac16c5cc958d509c 100644 (file)
--- a/Mac/mwerks/mwerks_small_config.h
+++ b/Mac/mwerks/mwerks_small_config.h
@@ -24,6 +24,7 @@
 /* #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

diff --git a/Mac/mwerks/mwerks_thrcarbonsm_config.h b/Mac/mwerks/mwerks_thrcarbonsm_config.h
index 1e1e7236e052a0c01c629dca1814f9f28fcd759c..6ea97e47c8994b56b08f8dd3432a0a7d077d06f8 100644 (file)
--- a/Mac/mwerks/mwerks_thrcarbonsm_config.h
+++ b/Mac/mwerks/mwerks_thrcarbonsm_config.h
@@ -31,6 +31,7 @@
 /* #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

diff --git a/Mac/mwerks/mwerks_threadsmall_config.h b/Mac/mwerks/mwerks_threadsmall_config.h
index 223039eb218e6fc0d441aceaea9985871c2e5a55..f4199efc37925cdb5e8a911a5f1ce3cc19fb987b 100644 (file)
--- a/Mac/mwerks/mwerks_threadsmall_config.h
+++ b/Mac/mwerks/mwerks_threadsmall_config.h
@@ -25,6 +25,7 @@
 /* #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

diff --git a/Mac/mwerks/mwerks_tkplugin_config.h b/Mac/mwerks/mwerks_tkplugin_config.h
index f13d9ab091cc8496b23d129be68dec58746e361d..d0fb8112a9aece35c99136c16a1964877ac15ecd 100644 (file)
--- a/Mac/mwerks/mwerks_tkplugin_config.h
+++ b/Mac/mwerks/mwerks_tkplugin_config.h
@@ -10,3 +10,4 @@
 #define WITH_THREAD            /* Use thread support (needs GUSI 2, not GUSI 1) */
 #define USE_TK                 /* Include _tkinter module in core Python */
 #define MAC_TCL                        /* This *must* be on if USE_TK is on */
+#define WITHOUT_FRAMEWORKS     /* Use old-style Universal Header includes, not Carbon/Carbon.h */