Initial port to CodeWarrior CFM68K support (mainly by disabling

unsupported features).

diff --git a/Mac/Include/config.h b/Mac/Include/config.h
index b78d63bcae48244aa4ebcab30428f6d79fe5734b..93def6cbf120d0c363015a6ffa4bb36a1b483d4c 100644 (file)
--- a/Mac/Include/config.h
+++ b/Mac/Include/config.h
@@ -13,7 +13,7 @@
 #define HAVE_FOPENRF
 #endif
 
-#ifdef __CFM68K__
+#ifdef SYMANTEC__CFM68K__
 #define atof Py_AtoF
 #define strtod Py_StrToD
 #endif

diff --git a/Mac/Include/macdefs.h b/Mac/Include/macdefs.h
index b64a47e69293ecea4cde546ab4caa78a3f6c0f70..71f73b105627c236f1db05096799961d51ce277b 100644 (file)
--- a/Mac/Include/macdefs.h
+++ b/Mac/Include/macdefs.h
@@ -13,6 +13,9 @@
 
 #ifdef __MWERKS__
 #include "errno_unix.h"
+#include <Strings.h>
+#define c2pstr C2PStr
+#define p2cstr P2CStr
 #endif
 #include <errno.h>
 #include <string.h>

diff --git a/Mac/Include/macglue.h b/Mac/Include/macglue.h
index a9ef0f7027cba44180141d83584a56010dfa1017..13468fb183a71612a228fabfdd5f1a90b9ad9062 100644 (file)
--- a/Mac/Include/macglue.h
+++ b/Mac/Include/macglue.h
@@ -34,7 +34,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define HAVE_UNIVERSAL_HEADERS
 #endif
 
-#ifdef __CFM68K__
+#ifdef SYMANTEC__CFM68K__
 #pragma lib_export on
 #endif
 

diff --git a/Mac/Modules/config.c b/Mac/Modules/config.c
index 385372a49508fb4cb0842f8a1d1da3eb222d1573..224be8b0ba577054230a6f5b0d44001bd3edb57a 100644 (file)
--- a/Mac/Modules/config.c
+++ b/Mac/Modules/config.c
@@ -94,10 +94,14 @@ getversion()
 #ifdef __MWERKS__
 #ifdef __powerc
        strcat(version, " [MW PPC compiler]");
+#else
+#ifdef __CFM68K__
+       strcat(version, " [MW CFM68K compiler]");
 #else
        strcat(version, " [MW 68K compiler]");
 #endif
 #endif
+#endif
 #ifdef THINK_C
 #ifdef __SC__
        strcat(version, " [Symantec Think C compiler]");
@@ -330,7 +334,7 @@ struct {
 } inittab[] = {
 
        {"array", initarray},
-#ifndef __CFM68K__
+#ifndef SYMANTEC__CFM68K__
 /* The math library seems mostly broken... */
        {"math", initmath},
 #endif

diff --git a/Mac/Python/macapplication.c b/Mac/Python/macapplication.c
index bac0620bd72034b6db354fc829af7491fb81079d..00287418826eb2173d7fb53e7d50387e8dc36836 100644 (file)
--- a/Mac/Python/macapplication.c
+++ b/Mac/Python/macapplication.c
@@ -24,12 +24,15 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /* Macintosh Applet Python main program */
 
-#ifdef __CFM68K__
+#ifdef SYMANTEC__CFM68K__
 #pragma lib_export on
 #endif
 
 extern void PyMac_InitApplication();
 
 main() {
+#if defined(__MWERKS__) && defined(__CFM68K__)
+       printf("Hello, world!\n");
+#endif
        PyMac_InitApplication();
 }

diff --git a/Mac/Python/macgetargv.c b/Mac/Python/macgetargv.c
index 66c6d59f218c025330443d815d0f204c46712213..5f2e637718e1d3c3232840e906dd2c939231e5bd 100644 (file)
--- a/Mac/Python/macgetargv.c
+++ b/Mac/Python/macgetargv.c
@@ -50,7 +50,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define HAVE_UNIVERSAL_HEADERS
 #endif
 
-#ifdef __CFM68K__
+#ifdef SYMANTEC__CFM68K__
 #pragma lib_export on
 #endif
 
@@ -120,6 +120,9 @@ get_full_path (FSSpec *fss, char *buf)
        char tmpbuf[256];
        int plen;
 
+#if defined(__MWERKS__) && defined(__CFM68K__)
+       return -1; /* get_folder_parent doesn't work */
+#endif
        fss_current = *fss;
        plen = fss_current.name[0];
        memcpy(buf, &fss_current.name[1], plen);

diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c
index 38f654fb80956c3760855b6822ed52a6ed5dc40b..24667e65d50d6bf3d19551d55e1333a9d374b3ee 100644 (file)
--- a/Mac/Python/macglue.c
+++ b/Mac/Python/macglue.c
@@ -223,6 +223,9 @@ static void
 scan_event_queue(flush)
        int flush;
 {
+#if defined(__MWERKS__) && defined(__CFM68K__)
+       return; /* No GetEvQHdr yet */
+#else
        register EvQElPtr q;
        
        q = (EvQElPtr) GetEvQHdr()->qHead;
@@ -237,6 +240,7 @@ scan_event_queue(flush)
                        break;
                }
        }
+#endif
 }
 
 int

diff --git a/Mac/mwerks/old/mwerks_cfm68k_config.h b/Mac/mwerks/old/mwerks_cfm68k_config.h
new file mode 100644 (file)
index 0000000..7770af7
--- /dev/null
+++ b/Mac/mwerks/old/mwerks_cfm68k_config.h
@@ -0,0 +1,2 @@
+#define HAVE_CONFIG_H
+#define USE_MAC_DYNAMIC_LOADING