Ported to CodeWarrior 6

Mac/Compat/macstat.h

@@ -26,3 +26,8 @@ struct macstat {
 #define S_IREAD    0400
 #define S_IWRITE   0200
 #define S_IEXEC    0100
+
+/* To stop inclusion of MWerks header: */
+#ifndef _STAT
+#define _STAT
+#endif

Mac/Modules/macmodule.c

@@ -454,6 +454,7 @@ mac_write(self, args)
 }
 #endif /* !__MWERKS__ */
 
+#undef MALLOC_DEBUG
 #ifdef MALLOC_DEBUG
 static object *
 mac_mstats(self, args)

Mac/Unsupported/mactcp/macdnrmodule.c

@@ -32,9 +32,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef HAVE_UNIVERSAL_HEADERS
 #define ResultUPP ResultProcPtr
 #define NewResultProc(x) (x)
-/* The '2' has move in this name... */
-#define Result2UPP ResultProc2Ptr
-#define NewResult2Proc(x) (x)
+#define ResultProc2UPP ResultProc2Ptr
+#define NewResultProc2Proc(x) (x)
 #endif
 
 static object *ErrorObject;
@@ -365,7 +364,7 @@ dnr_HInfo(self, args)
 	OSErr err;
 	char *hostname;
 	dnrrobject *rv;
-	Result2UPP cb_upp = NewResult2Proc(dnrr_done);
+	ResultProc2UPP cb_upp = NewResultProc2Proc(dnrr_done);
 
 	if (!newgetargs(args, "s", &hostname))
 		return NULL;
@@ -398,7 +397,7 @@ dnr_MXInfo(self, args)
 	OSErr err;
 	char *hostname;
 	dnrrobject *rv;
-	Result2UPP cb_upp = NewResult2Proc(dnrr_done);
+	ResultProc2UPP cb_upp = NewResultProc2Proc(dnrr_done);
 
 	if (!newgetargs(args, "s", &hostname))
 		return NULL;