* macmodule.c: include allobjects.h, not .c

* timemodule.c: the mac has no unistd.h
* classobject.c: fixed several cases of return NULL that should be
  return -1 !!!

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 4d13611b5e0a41803a4bc592af23fd946fac70eb..69a0c888238c976e44ac681fde53f9f93201ec94 100644 (file)
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -33,6 +33,10 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <signal.h>
 #include <setjmp.h>
 
+#ifdef macintosh
+#define NO_UNISTD
+#endif
+
 #ifndef NO_UNISTD
 #include <unistd.h>
 #endif

diff --git a/Objects/classobject.c b/Objects/classobject.c
index 8164cedf3b49e2ba7c4ee7cbf4e47644fc5d7cb7..d4a2f82401c274d8f83429d2c80691d0b86939ce 100644 (file)
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -396,7 +396,7 @@ instance_ass_subscript(inst, key, value)
                arg = mkvalue("(OO)", key, value);
        if (arg == NULL) {
                DECREF(func);
-               return NULL;
+               return -1;
        }
        res = call_object(func, arg);
        DECREF(func);
@@ -509,14 +509,14 @@ instance_ass_item(inst, i, item)
        else
                func = instance_getattr(inst, "__setitem__");
        if (func == NULL)
-               return NULL;
+               return -1;
        if (item == NULL)
                arg = mkvalue("i", i);
        else
                arg = mkvalue("(iO)", i, item);
        if (arg == NULL) {
                DECREF(func);
-               return NULL;
+               return -1;
        }
        res = call_object(func, arg);
        DECREF(func);
@@ -540,14 +540,14 @@ instance_ass_slice(inst, i, j, value)
        else
                func = instance_getattr(inst, "__setslice__");
        if (func == NULL)
-               return NULL;
+               return -1;
        if (value == NULL)
                arg = mkvalue("(ii)", i, j);
        else
                arg = mkvalue("(iiO)", i, j, value);
        if (arg == NULL) {
                DECREF(func);
-               return NULL;
+               return -1;
        }
        res = call_object(func, arg);
        DECREF(func);