From 6d946f98bd233efa676b7a05cb01cd0ca92549c0 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 14 Aug 1992 13:49:30 +0000 Subject: * 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 !!! --- Modules/timemodule.c | 4 ++++ Objects/classobject.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 4d13611..69a0c88 100644 --- 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 #include +#ifdef macintosh +#define NO_UNISTD +#endif + #ifndef NO_UNISTD #include #endif diff --git a/Objects/classobject.c b/Objects/classobject.c index 8164ced..d4a2f82 100644 --- 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); -- cgit v0.12