Commit cbf630f0 authored by Jack Jansen's avatar Jack Jansen

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

mac-specific functions to have a PyMac_ name.
parent 28fc880e
...@@ -23,6 +23,10 @@ redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. ...@@ -23,6 +23,10 @@ redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#include "eval.h" #include "eval.h"
#include "opcode.h" #include "opcode.h"
#ifdef macintosh
#include "macglue.h"
#endif
#include <ctype.h> #include <ctype.h>
#ifdef HAVE_LIMITS_H #ifdef HAVE_LIMITS_H
......
...@@ -698,7 +698,7 @@ write_compiled_module(co, cpathname, mtime) ...@@ -698,7 +698,7 @@ write_compiled_module(co, cpathname, mtime)
if (Py_VerboseFlag) if (Py_VerboseFlag)
PySys_WriteStderr("# wrote %s\n", cpathname); PySys_WriteStderr("# wrote %s\n", cpathname);
#ifdef macintosh #ifdef macintosh
setfiletype(cpathname, 'Pyth', 'PYC '); PyMac_setfiletype(cpathname, 'Pyth', 'PYC ');
#endif #endif
} }
......
...@@ -34,6 +34,9 @@ redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. ...@@ -34,6 +34,9 @@ redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#include "windows.h" #include "windows.h"
#endif #endif
#ifdef macintosh
#include "macglue.h"
#endif
extern char *Py_GetPath(); extern char *Py_GetPath();
extern grammar _PyParser_Grammar; /* From graminit.c */ extern grammar _PyParser_Grammar; /* From graminit.c */
...@@ -561,8 +564,8 @@ PyRun_SimpleFile(fp, filename) ...@@ -561,8 +564,8 @@ PyRun_SimpleFile(fp, filename)
if (strcmp(ext, ".pyc") == 0 || strcmp(ext, ".pyo") == 0 if (strcmp(ext, ".pyc") == 0 || strcmp(ext, ".pyo") == 0
#ifdef macintosh #ifdef macintosh
/* On a mac, we also assume a pyc file for types 'PYC ' and 'APPL' */ /* On a mac, we also assume a pyc file for types 'PYC ' and 'APPL' */
|| getfiletype(filename) == 'PYC ' || PyMac_getfiletype(filename) == 'PYC '
|| getfiletype(filename) == 'APPL' || PyMac_getfiletype(filename) == 'APPL'
#endif /* macintosh */ #endif /* macintosh */
) { ) {
/* Try to run a pyc file. First, re-open in binary */ /* Try to run a pyc file. First, re-open in binary */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment