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;