Kaydet (Commit) 0ffdd05c authored tarafından Guido van Rossum's avatar Guido van Rossum

Jonathan Giddy notes, and Chris Lawrence agrees, that some comments on

#else/#endif are wrong, and that #if HAVE_TM_ZONE should be #ifdef.
üst 93aa0f23
...@@ -634,8 +634,8 @@ inittime() ...@@ -634,8 +634,8 @@ inittime()
#endif #endif
ins(d, "daylight", PyInt_FromLong((long)daylight)); ins(d, "daylight", PyInt_FromLong((long)daylight));
ins(d, "tzname", Py_BuildValue("(zz)", tzname[0], tzname[1])); ins(d, "tzname", Py_BuildValue("(zz)", tzname[0], tzname[1]));
#else /* !HAVE_TZNAME && !__GNU_LIBRARY__ */ #else /* !HAVE_TZNAME || __GNU_LIBRARY__ */
#if HAVE_TM_ZONE #ifdef HAVE_TM_ZONE
{ {
#define YEAR ((time_t)((365 * 24 + 6) * 3600)) #define YEAR ((time_t)((365 * 24 + 6) * 3600))
time_t t; time_t t;
...@@ -683,7 +683,7 @@ inittime() ...@@ -683,7 +683,7 @@ inittime()
ins(d, "tzname", Py_BuildValue("(zz)", "", "")); ins(d, "tzname", Py_BuildValue("(zz)", "", ""));
#endif /* macintosh */ #endif /* macintosh */
#endif /* HAVE_TM_ZONE */ #endif /* HAVE_TM_ZONE */
#endif /* !HAVE_TZNAME */ #endif /* !HAVE_TZNAME || __GNU_LIBRARY__ */
if (PyErr_Occurred()) if (PyErr_Occurred())
Py_FatalError("Can't initialize time module"); Py_FatalError("Can't initialize time module");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment