Minor fixes / changes for Mac compatibility.
diff --git a/Modules/imageop.c b/Modules/imageop.c
index 67aa9fc..40940cb 100644
--- a/Modules/imageop.c
+++ b/Modules/imageop.c
@@ -156,7 +156,7 @@
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 @@
}
}
} 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 c50b35a..527b062 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -763,7 +763,7 @@
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 @@
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 b51e3d8..38829e2 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -442,7 +442,7 @@
{
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 c50b35a..527b062 100644
--- a/Objects/mappingobject.c
+++ b/Objects/mappingobject.c
@@ -763,7 +763,7 @@
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 @@
last_name_object = newstringobject(key);
if (last_name_object == NULL) {
last_name_char = NULL;
- return NULL;
+ return -1;
}
last_name_char = key;
}