summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1999-04-05 21:54:14 (GMT)
committerGuido van Rossum <guido@python.org>1999-04-05 21:54:14 (GMT)
commit0ffdd05cc331a7c743439188a89c44320b796a59 (patch)
treeda8ba091011ad0015280eeaf5c682d5660337e3e
parent93aa0f23a7124a1f5a8b0e2f41685b5cb9c7f01b (diff)
downloadcpython-0ffdd05cc331a7c743439188a89c44320b796a59.zip
cpython-0ffdd05cc331a7c743439188a89c44320b796a59.tar.gz
cpython-0ffdd05cc331a7c743439188a89c44320b796a59.tar.bz2
Jonathan Giddy notes, and Chris Lawrence agrees, that some comments on
#else/#endif are wrong, and that #if HAVE_TM_ZONE should be #ifdef.
-rw-r--r--Modules/timemodule.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 174b7a8..bd6d727 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -634,8 +634,8 @@ inittime()
#endif
ins(d, "daylight", PyInt_FromLong((long)daylight));
ins(d, "tzname", Py_BuildValue("(zz)", tzname[0], tzname[1]));
-#else /* !HAVE_TZNAME && !__GNU_LIBRARY__ */
-#if HAVE_TM_ZONE
+#else /* !HAVE_TZNAME || __GNU_LIBRARY__ */
+#ifdef HAVE_TM_ZONE
{
#define YEAR ((time_t)((365 * 24 + 6) * 3600))
time_t t;
@@ -683,7 +683,7 @@ inittime()
ins(d, "tzname", Py_BuildValue("(zz)", "", ""));
#endif /* macintosh */
#endif /* HAVE_TM_ZONE */
-#endif /* !HAVE_TZNAME */
+#endif /* !HAVE_TZNAME || __GNU_LIBRARY__ */
if (PyErr_Occurred())
Py_FatalError("Can't initialize time module");
}