From: Jack Jansen <jack.jansen@cwi.nl>
Date: Tue, 11 Jul 2000 21:59:16 +0000 (+0000)
Subject: Include macglue.h for some function prototypes, and renamed a few
X-Git-Tag: v2.0b1~879
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cbf630f0a916b6e34295379db01a6e2950e05012;p=thirdparty%2FPython%2Fcpython.git

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 0bf5d0041061..bcdd98f31878 100644
--- 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 f1efccb8718d..99c811fb842f 100644
--- 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 9cc80724f836..afb9589a5195 100644
--- 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 */