summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1995-02-14 01:27:24 (GMT)
committerGuido van Rossum <guido@python.org>1995-02-14 01:27:24 (GMT)
commitbecdbec8067c0e4cd9c0d9aad682c547d8a2bba3 (patch)
treecd225f6b3373d564641d4f84136181ad3f2597d5
parente2aaa9dd61632e48da08372dfb7f3365ed6d663b (diff)
downloadcpython-becdbec8067c0e4cd9c0d9aad682c547d8a2bba3.zip
cpython-becdbec8067c0e4cd9c0d9aad682c547d8a2bba3.tar.gz
cpython-becdbec8067c0e4cd9c0d9aad682c547d8a2bba3.tar.bz2
ported to Think C
-rw-r--r--Mac/Include/macglue.h8
-rw-r--r--Mac/Modules/config.c15
-rw-r--r--Mac/Modules/macfsmodule.c1
-rw-r--r--Mac/Python/macglue.c3
4 files changed, 26 insertions, 1 deletions
diff --git a/Mac/Include/macglue.h b/Mac/Include/macglue.h
index d868534..a299016 100644
--- a/Mac/Include/macglue.h
+++ b/Mac/Include/macglue.h
@@ -22,10 +22,18 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
******************************************************************/
+#ifndef SystemSevenOrLater
+#define SystemSevenOrLater 1
+#endif
+
#include <Types.h>
#include <Files.h>
#include <Events.h>
+#ifdef GENERATINGCFM /* Defined to 0 or 1 in Universal headers */
+#define HAVE_UNIVERSAL_HEADERS
+#endif
+
char *macstrerror(int); /* strerror with mac errors */
extern int PyMac_DoYieldEnabled; /* Don't do eventloop when false */
diff --git a/Mac/Modules/config.c b/Mac/Modules/config.c
index fee7899..ba6f999 100644
--- a/Mac/Modules/config.c
+++ b/Mac/Modules/config.c
@@ -100,6 +100,20 @@ getversion()
strcat(version, " [MW 68K compiler]");
#endif
#endif
+#ifdef THINK_C
+#ifdef __SC__
+ strcat(version, " [Symantec Think C compiler]");
+#else
+ strcat(version, " [Think C compiler]");
+#endif
+#endif
+#ifdef MPW
+#ifdef __SC__
+ strcat(version, " [Symantec MPW C compiler]");
+#else
+ strcat(version, " [Apple MPW C compiler]");
+#endif
+#endif
return version;
}
@@ -335,6 +349,7 @@ struct {
#ifdef THINK_C
{"Snd", initSnd},
{"Win", initWin},
+#endif
/* -- ADDMODULE MARKER 2 -- */
diff --git a/Mac/Modules/macfsmodule.c b/Mac/Modules/macfsmodule.c
index d2f1a5d..bfdb15b 100644
--- a/Mac/Modules/macfsmodule.c
+++ b/Mac/Modules/macfsmodule.c
@@ -26,6 +26,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "modsupport.h" /* For getargs() etc. */
#include "macglue.h"
+#include <Memory.h>
#include <Files.h>
#include <StandardFile.h>
#include <Aliases.h>
diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c
index f9c3154..c979e2a 100644
--- a/Mac/Python/macglue.c
+++ b/Mac/Python/macglue.c
@@ -23,6 +23,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
******************************************************************/
#include "Python.h"
+
#include "macglue.h"
#include <OSUtils.h> /* for Set(Current)A5 */
@@ -401,7 +402,7 @@ PyMac_GetPythonDir()
prefrh = FSpOpenResFile(&dirspec, fsRdWrShPerm);
if ( prefrh == -1 ) {
/* It doesn't exist. Try to create it */
- FSpCreateResFile(&dirspec, 'PYTH', 'pref', NULL);
+ FSpCreateResFile(&dirspec, 'PYTH', 'pref', 0);
prefrh = FSpOpenResFile(&dirspec, fsRdWrShPerm);
if ( prefrh == -1 ) {
cannotmodify = 1;