Some more changes
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,