Minor fixes / changes for Mac compatibility.

diff --git a/Modules/imageop.c b/Modules/imageop.c
index 67aa9fc7486d4cb84a13bd1bd6c8afe963c393a8..40940cb7f95296eb5973d6752075673917e58ec9 100644 (file)
--- 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 c50b35a335e745b8bc647bdd58bb6a1ae4d01b13..527b062467edf9febe35370fe1e2631e961e8049 100644 (file)
--- 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 b51e3d83dfa00178807d298caae9d8c2c6071c62..38829e2d3f121924d2e67e32d1ac4593e0f539d0 100644 (file)
--- 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 c50b35a335e745b8bc647bdd58bb6a1ae4d01b13..527b062467edf9febe35370fe1e2631e961e8049 100644 (file)
--- 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;
        }