Skip to content

C
cpython
Kaydet (Commit) 2645241a authored tarafından Guido van Rossum's avatar Guido van Rossum
Dosyalara gözat
Seçenekler

Fixes for OS/2 by Jeff Rush.

üst 03dc5384
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
Modules/timemodule.c
Dosyayı görüntüle @ 2645241a
...@@ -90,16 +90,8 @@ extern int ftime(); ...@@ -90,16 +90,8 @@ extern int ftime();
#undef HAVE_CLOCK /* We have our own version down below */ #undef HAVE_CLOCK /* We have our own version down below */
#endif /* MS_WIN32 */ #endif /* MS_WIN32 */
#if defined(PYOS_OS2)
#define INCL_DOS
#define INCL_DOSERRORS
#define INCL_NOPMAPI
#include <os2.h>
#endif
#if defined(PYCC_VACPP) #if defined(PYCC_VACPP)
#include <time.h> #include <sys/time.h>
#define timezone _timezone
#endif #endif
#ifdef __BEOS__ #ifdef __BEOS__
...@@ -611,11 +603,19 @@ inittime() ...@@ -611,11 +603,19 @@ inittime()
d = PyModule_GetDict(m); d = PyModule_GetDict(m);
#ifdef HAVE_TZNAME #ifdef HAVE_TZNAME
tzset(); tzset();
#ifdef PYOS_OS2
ins(d, "timezone", PyInt_FromLong((long)_timezone));
#else /* !PYOS_OS2 */
ins(d, "timezone", PyInt_FromLong((long)timezone)); ins(d, "timezone", PyInt_FromLong((long)timezone));
#endif /* PYOS_OS2 */
#ifdef HAVE_ALTZONE #ifdef HAVE_ALTZONE
ins(d, "altzone", PyInt_FromLong((long)altzone)); ins(d, "altzone", PyInt_FromLong((long)altzone));
#else #else
#ifdef PYOS_OS2
ins(d, "altzone", PyInt_FromLong((long)_timezone-3600));
#else /* !PYOS_OS2 */
ins(d, "altzone", PyInt_FromLong((long)timezone-3600)); ins(d, "altzone", PyInt_FromLong((long)timezone-3600));
#endif /* PYOS_OS2 */
#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]));
......
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