Ported to CodeWarrior 6

diff --git a/Mac/Compat/macstat.h b/Mac/Compat/macstat.h
index 4c2421998c185fc0d036279b0ab4be87922b9c33..64ace4e7f4061765b272e57964af3a0be4a6ddfb 100644 (file)
--- a/Mac/Compat/macstat.h
+++ b/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

diff --git a/Mac/Modules/macmodule.c b/Mac/Modules/macmodule.c
index 9d757bce1abd0e793e67aea0ecf7ad5b98023513..239e1a5aec5eb3dc9603f5c6d4a86e03d3ca4dfe 100644 (file)
--- a/Mac/Modules/macmodule.c
+++ b/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)

diff --git a/Mac/Unsupported/mactcp/macdnrmodule.c b/Mac/Unsupported/mactcp/macdnrmodule.c
index ac4222230f8f7c453b43ef1e35c5f5376e4b25bf..fe89e035edb8491d98e147d09a25618a5d797509 100644 (file)
--- a/Mac/Unsupported/mactcp/macdnrmodule.c
+++ b/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;