Include macglue.h for some function prototypes, and renamed a few

jackjansen · jackjansen · commit cbf630f0a916 · 2000-07-11T21:59:16.000Z
mac-specific functions to have a PyMac_ name.
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -23,6 +23,10 @@ redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #include "eval.h"
 #include "opcode.h"
 
+#ifdef macintosh
+#include "macglue.h"
+#endif
+
 #include <ctype.h>
 
 #ifdef HAVE_LIMITS_H
diff --git a/Python/import.c b/Python/import.c
@@ -698,7 +698,7 @@ write_compiled_module(co, cpathname, mtime)
 	if (Py_VerboseFlag)
 		PySys_WriteStderr("# wrote %s\n", cpathname);
 #ifdef macintosh
-	setfiletype(cpathname, 'Pyth', 'PYC ');
+	PyMac_setfiletype(cpathname, 'Pyth', 'PYC ');
 #endif
 }
 
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -34,6 +34,9 @@ redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #include "windows.h"
 #endif
 
+#ifdef macintosh
+#include "macglue.h"
+#endif
 extern char *Py_GetPath();
 
 extern grammar _PyParser_Grammar; /* From graminit.c */
@@ -561,8 +564,8 @@ PyRun_SimpleFile(fp, filename)
 	if (strcmp(ext, ".pyc") == 0 || strcmp(ext, ".pyo") == 0
 #ifdef macintosh
 	/* On a mac, we also assume a pyc file for types 'PYC ' and 'APPL' */
-	    || getfiletype(filename) == 'PYC '
-	    || getfiletype(filename) == 'APPL'
+	    || PyMac_getfiletype(filename) == 'PYC '
+	    || PyMac_getfiletype(filename) == 'APPL'
 #endif /* macintosh */
 		) {
 		/* Try to run a pyc file. First, re-open in binary */

Original file line number	Diff line number	Diff line change
`@@ -698,7 +698,7 @@ write_compiled_module(co, cpathname, mtime)`
`698`	`698`	`if (Py_VerboseFlag)`
`699`	`699`	`PySys_WriteStderr("# wrote %s\n", cpathname);`
`700`	`700`	`#ifdef macintosh`
`701`		`- setfiletype(cpathname, 'Pyth', 'PYC ');`
	`701`	`+ PyMac_setfiletype(cpathname, 'Pyth', 'PYC ');`
`702`	`702`	`#endif`
`703`	`703`	`}`
`704`	`704`