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

mac-specific functions to have a PyMac_ name.

diff --git a/Python/ceval.c b/Python/ceval.c
index 0bf5d00410614a2e882da0fbb6f149611dd67681..bcdd98f31878c7f88908c22be866806c78ee2fb1 100644 (file)
--- 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
index f1efccb8718d836cd390de4ad181aa0b3d653ebc..99c811fb842fba3a470c17f6a725d5160ef8ecb2 100644 (file)
--- 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
index 9cc80724f83693735f87bb84485d3e50066423f1..afb9589a51956686e944e0738641e0b93cbb07c5 100644 (file)
--- 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 */