ported to Think C

diff --git a/Mac/Include/macglue.h b/Mac/Include/macglue.h
index d86853458dbf34449a544b919fa0d5af41dbe05f..a2990167d64e017d0350588f988cd80ecceada8d 100644 (file)
--- 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 fee7899e53bd024910d682234aea5e035fef877f..ba6f999251e7d393107750476d5b866f9990855a 100644 (file)
--- a/Mac/Modules/config.c
+++ b/Mac/Modules/config.c
@@ -99,6 +99,20 @@ getversion()
 #else
        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 d2f1a5d84216adb03a78c58a4da25683e777363c..bfdb15b8caee44d6743a56b3240f8412431464b5 100644 (file)
--- 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 f9c315474d56a7890ceedabb98eec94ec280aa6f..c979e2a5dda37be09d8de67b0eacf7850128c635 100644 (file)
--- 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;