From 6598c579c79a74fc778c4bf1660dcc5af0c377f4 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Thu, 29 Jul 1993 08:25:09 +0000
Subject: Minor fixes / changes for Mac compatibility.

---
 Modules/imageop.c       | 4 ++--
 Objects/dictobject.c    | 4 ++--
 Objects/listobject.c    | 2 +-
 Objects/mappingobject.c | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Modules/imageop.c b/Modules/imageop.c
index 67aa9fc748..40940cb7f9 100644
--- a/Modules/imageop.c
+++ b/Modules/imageop.c
@@ -156,7 +156,7 @@ imageop_tovideo(self, args)
     ncp = (unsigned char *)getstringvalue(rv);
 
     if ( width == 1 ) {
-	bcopy(cp, ncp, maxx);		/* Copy first line */
+	memcpy(ncp, cp, maxx);		/* Copy first line */
 	ncp += maxx;
 	for (y=1; y<maxy; y++) {	/* Interpolate other lines */
 	    for(x=0; x<maxx; x++) {
@@ -165,7 +165,7 @@ imageop_tovideo(self, args)
 	    }
 	}
     } else {
-	bcopy(cp, ncp, maxx*4);		/* Copy first line */
+	memcpy(ncp, cp, maxx*4);		/* Copy first line */
 	ncp += maxx*4;
 	for (y=1; y<maxy; y++) {	/* Interpolate other lines */
 	    for(x=0; x<maxx; x++) {
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index c50b35a335..527b062467 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -763,7 +763,7 @@ dictinsert(v, key, item)
 		last_name_object = newstringobject(key);
 		if (last_name_object == NULL) {
 			last_name_char = NULL;
-			return NULL;
+			return -1;
 		}
 		last_name_char = key;
 	}
@@ -780,7 +780,7 @@ dictremove(v, key)
 		last_name_object = newstringobject(key);
 		if (last_name_object == NULL) {
 			last_name_char = NULL;
-			return NULL;
+			return -1;
 		}
 		last_name_char = key;
 	}
diff --git a/Objects/listobject.c b/Objects/listobject.c
index b51e3d83df..38829e2d3f 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -442,7 +442,7 @@ setlistslice(a, ilow, ihigh, v)
 {
 	if (!is_listobject(a)) {
 		err_badcall();
-		return NULL;
+		return -1;
 	}
 	return list_ass_slice((listobject *)a, ilow, ihigh, v);
 }
diff --git a/Objects/mappingobject.c b/Objects/mappingobject.c
index c50b35a335..527b062467 100644
--- a/Objects/mappingobject.c
+++ b/Objects/mappingobject.c
@@ -763,7 +763,7 @@ dictinsert(v, key, item)
 		last_name_object = newstringobject(key);
 		if (last_name_object == NULL) {
 			last_name_char = NULL;
-			return NULL;
+			return -1;
 		}
 		last_name_char = key;
 	}
@@ -780,7 +780,7 @@ dictremove(v, key)
 		last_name_object = newstringobject(key);
 		if (last_name_object == NULL) {
 			last_name_char = NULL;
-			return NULL;
+			return -1;
 		}
 		last_name_char = key;
 	}
-- 
cgit v1.2.1