From 00c567ce6f7c796a11ca3db36b22b6dbd24797cc Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Sat, 27 Jul 1991 23:09:30 +0000 Subject: [PATCH] All mac compilers now use 1904 as the Epoch... --- Modules/timemodule.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 0b8faf2edbe..a3bd383ee48 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -69,15 +69,13 @@ time_time(self, args) if (!getnoarg(args)) return NULL; time(&secs); -#ifdef applec /* MPW */ -/* Difference in origin between Mac and Unix clocks: */ -/* For THINK C 3.0 add a correction like 5*3600; - it converts to UCT from local assuming EST */ +#ifdef macintosh +/* The Mac epoch is 1904, while UNIX uses 1970; Python prefers 1970 */ +/* Moreover, the Mac returns local time. This we cannot fix... */ #define TIMEDIFF ((time_t) \ (((1970-1904)*365L + (1970-1904)/4) * 24 * 3600)) secs -= TIMEDIFF; -/* XXX It's almost better to directly fetch the Mac clock... */ -#endif /* applec */ +#endif return newintobject((long)secs); }