summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2000-07-11 21:59:16 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2000-07-11 21:59:16 (GMT)
commitcbf630f0a916b6e34295379db01a6e2950e05012 (patch)
tree126400ff619ca4c0130d0d8b974eb8f7efeef6be /Python
parent28fc880e9ac15c0f8f704b5862bdc38be0985d99 (diff)
downloadcpython-cbf630f0a916b6e34295379db01a6e2950e05012.zip
cpython-cbf630f0a916b6e34295379db01a6e2950e05012.tar.gz
cpython-cbf630f0a916b6e34295379db01a6e2950e05012.tar.bz2
Include macglue.h for some function prototypes, and renamed a few
mac-specific functions to have a PyMac_ name.
Diffstat (limited to 'Python')
-rw-r--r--Python/ceval.c4
-rw-r--r--Python/import.c2
-rw-r--r--Python/pythonrun.c7
3 files changed, 10 insertions, 3 deletions
diff --git a/Python/ceval.c b/Python/ceval.c
index 0bf5d00..bcdd98f 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 f1efccb..99c811f 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 9cc8072..afb9589 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 */