Some more changes
diff --git a/Mac/Include/config.h b/Mac/Include/config.h
index c92f1a6..7b98e95 100644
--- a/Mac/Include/config.h
+++ b/Mac/Include/config.h
@@ -1,6 +1,6 @@
/* config.h for Macintosh THINK C 6.0. */
-/* Define if on Macintosh (THINK C or MPW */
+/* Define if on Macintosh (THINK_C or MPW should also be defined) */
#define macintosh
/* Define if on AIX 3.
@@ -166,7 +166,7 @@
#undef HAVE_GETTIMEOFDAY
/* Define if you have getwd. */
-#define HAVE_GETWD 1
+#undef HAVE_GETWD
/* Define if you have link. */
#undef HAVE_LINK
diff --git a/Mac/Modules/config.c b/Mac/Modules/config.c
index abb5296..54fed74 100644
--- a/Mac/Modules/config.c
+++ b/Mac/Modules/config.c
@@ -1,4 +1,3 @@
-/* Generated automatically from ../../Modules/config.c.in by makesetup. */
/* -*- C -*- ***********************************************
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
Amsterdam, The Netherlands.
@@ -23,12 +22,19 @@
******************************************************************/
-/* Universal Python configuration file */
+/* Macintosh Python configuration file */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#ifdef macintosh
+/* The Macintosh main program is in macmain.c */
+#define NO_MAIN
+/* Comment this out if you're not interested in STDWIN */
+#define USE_STDWIN
+#endif
+
#include <stdio.h>
#include <string.h>
@@ -53,10 +59,6 @@
int argc;
char **argv;
{
-#ifdef macintosh
- /* Macs always support stdwin */
-// wargs(&argc, &argv);
-#endif
argv0 = argv[0];
realmain(argc, argv);
}
@@ -190,6 +192,7 @@
extern void initfm();
extern void initgl();
extern void initimgfile();
+extern void initimgformat();
extern void initsgi();
extern void initsv();
extern void initfl();
@@ -199,6 +202,7 @@
extern void initnew();
extern void initdl();
extern void initsyslog();
+extern void initgestalt();
/* -- ADDMODULE MARKER 1 -- */
@@ -220,11 +224,14 @@
{"audioop", initaudioop},
{"imageop", initimageop},
{"rgbimg", initrgbimg},
-// {"stdwin", initstdwin},
+#ifdef USE_STDWIN
+ {"stdwin", initstdwin},
+#endif
{"md5", initmd5},
{"rotor", initrotor},
-// {"signal", initsignal},
{"new", initnew},
+ {"gestalt", initgestalt},
+ {"imgformat", initimgformat},
/* -- ADDMODULE MARKER 2 -- */
diff --git a/Mac/Modules/macmodule.c b/Mac/Modules/macmodule.c
index b495dfa..13d208c 100644
--- a/Mac/Modules/macmodule.c
+++ b/Mac/Modules/macmodule.c
@@ -33,12 +33,12 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
+#include <stat.h>
#include <fcntl.h>
#include "macdefs.h"
#include "dirent.h"
-#include "stat.h"
#ifndef MAXPATHLEN
#define MAXPATHLEN 1024
@@ -369,7 +369,7 @@
return mac_error();
return mkvalue("(llllllllll)",
(long)st.st_mode,
- 0L /* st_ino */,
+ (long)st.st_ito, /* XXX st_ino -- typo in THINK C <stat.h>? */
(long)st.st_dev,
(long)st.st_nlink,
(long)st.st_uid,
diff --git a/Mac/README b/Mac/README
index ce992c3..578ac2b 100644
--- a/Mac/README
+++ b/Mac/README
@@ -82,13 +82,13 @@
- From Mac: all .c files except fopenRF.c [[which shouldn't even
be there]].
- - From Parser: acceler.c, grammar1.c, myreadline.c, node.c,
+ - From Parser: acceler.c, grammar1.c, intrcheck.c, myreadline.c, node.c,
parser.c, parsetok.c, tokenizer.c.
- From Python: bltinmodule.c, ceval.c, cgensupport.c,
compile.c, errors.c, getopt.c, graminit.c, import.c,
marshal.c, modsupport.c, mystrtoul.c, pythonmain.c,
- pythonrun.c, structmember.c, sysmodule.c, traceback.c
+ pythonrun.c, sigcheck.c, structmember.c, sysmodule.c, traceback.c
(i.e. all .c files except dup2.c, fmod.c, frozenmain.c,
getcwd.c, getmtime.c, memmove.c, sigcheck.c, strerror.c,
strtod.c, thread.c)
@@ -102,9 +102,7 @@
macmodule.c in the Mac subdirectory, so it should already have
been added in a previous step.) Note that for most modules,
the source file is called <name>module.c, but for a few long
- module names it is just <module>.c. - If you don't add
- signalmodule.c, you must add intrcheck.c from Parser and
- sigcheck.c from Python.
+ module names it is just <module>.c.
The following THINK C libraries must be added: from Standard
Libraries, ANSI and unix; from Mac Libraries, MacTraps. I put each
diff --git a/Mac/Relnotes-1.2 b/Mac/Relnotes-1.2
index ce992c3..578ac2b 100644
--- a/Mac/Relnotes-1.2
+++ b/Mac/Relnotes-1.2
@@ -82,13 +82,13 @@
- From Mac: all .c files except fopenRF.c [[which shouldn't even
be there]].
- - From Parser: acceler.c, grammar1.c, myreadline.c, node.c,
+ - From Parser: acceler.c, grammar1.c, intrcheck.c, myreadline.c, node.c,
parser.c, parsetok.c, tokenizer.c.
- From Python: bltinmodule.c, ceval.c, cgensupport.c,
compile.c, errors.c, getopt.c, graminit.c, import.c,
marshal.c, modsupport.c, mystrtoul.c, pythonmain.c,
- pythonrun.c, structmember.c, sysmodule.c, traceback.c
+ pythonrun.c, sigcheck.c, structmember.c, sysmodule.c, traceback.c
(i.e. all .c files except dup2.c, fmod.c, frozenmain.c,
getcwd.c, getmtime.c, memmove.c, sigcheck.c, strerror.c,
strtod.c, thread.c)
@@ -102,9 +102,7 @@
macmodule.c in the Mac subdirectory, so it should already have
been added in a previous step.) Note that for most modules,
the source file is called <name>module.c, but for a few long
- module names it is just <module>.c. - If you don't add
- signalmodule.c, you must add intrcheck.c from Parser and
- sigcheck.c from Python.
+ module names it is just <module>.c.
The following THINK C libraries must be added: from Standard
Libraries, ANSI and unix; from Mac Libraries, MacTraps. I put each