Initial port to CodeWarrior CFM68K support (mainly by disabling

jackjansen · jackjansen · commit f74f63a43f3c · 1995-06-27T13:18:14.000Z
unsupported features).
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+#define HAVE_CONFIG_H
+#define USE_MAC_DYNAMIC_LOADING

Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,9 @@ static void`
`223`	`223`	`scan_event_queue(flush)`
`224`	`224`	`int flush;`
`225`	`225`	`{`
	`226`	`+#if defined(__MWERKS__) && defined(__CFM68K__)`
	`227`	`+ return; /* No GetEvQHdr yet */`
	`228`	`+#else`
`226`	`229`	`register EvQElPtr q;`
`227`	`230`
`228`	`231`	`q = (EvQElPtr) GetEvQHdr()->qHead;`
`@@ -237,6 +240,7 @@ scan_event_queue(flush)`
`237`	`240`	`break;`
`238`	`241`	`}`
`239`	`242`	`}`
	`243`	`+#endif`
`240`	`244`	`}`
`241`	`245`
`242`	`246`	`int`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#define HAVE_CONFIG_H`
	`2`	`+#define USE_MAC_DYNAMIC_LOADING`