summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2000-12-12 22:42:30 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2000-12-12 22:42:30 (GMT)
commit63596aeb33c2837d7802449c8906349c9ea1998e (patch)
treedb97e6460ed2ee21a07af967dd400dcf8d9a4b64 /Modules
parentd49056cd9076cde83ded11966f070f3f76ffd2a9 (diff)
downloadcpython-63596aeb33c2837d7802449c8906349c9ea1998e.zip
cpython-63596aeb33c2837d7802449c8906349c9ea1998e.tar.gz
cpython-63596aeb33c2837d7802449c8906349c9ea1998e.tar.bz2
The Mac C library (MSL from CodeWarrior 6) and I/O library (GUSI
2.1.3) finally agree on when the epoch is, so the code to convert epochs has been disabled.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/timemodule.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 116b377..31c1d21 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -8,7 +8,7 @@
#ifdef macintosh
#include <time.h>
#include <OSUtils.h>
-#ifdef USE_GUSI2
+#ifdef USE_GUSI211
/* GUSI, the I/O library which has the time() function and such uses the
** Mac epoch of 1904. MSL, the C library which has localtime() and so uses
** the ANSI epoch of 1900.
@@ -466,7 +466,7 @@ time_mktime(PyObject *self, PyObject *args)
"mktime argument out of range");
return NULL;
}
-#if defined(macintosh) && defined(USE_GUSI2)
+#if defined(macintosh) && defined(USE_GUSI211)
tt = tt - GUSI_TO_MSL_EPOCH;
#endif
return PyFloat_FromDouble((double)tt);