[Python-checkins] CVS: python/dist/src/Modules timemodule.c,2.110.2.1,2.110.2.2

[Anthony Baxter]

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv22192

Modified Files:
      Tag: release21-maint
	timemodule.c 
Log Message:
backport of 2.114:
  SF patch #459385 (Norman Vine): time.timezone fix for Cygwin.
(skipped whitespace normalisation section of patch - this is a bugfix, 
not a beauty contest :)


Index: timemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/timemodule.c,v
retrieving revision 2.110.2.1
retrieving revision 2.110.2.2
diff -C2 -d -r2.110.2.1 -r2.110.2.2
*** timemodule.c	2001/06/27 13:01:54	2.110.2.1
--- timemodule.c	2001/11/01 13:14:43	2.110.2.2
***************
*** 600,604 ****
  	Py_INCREF(d);
  	moddict = d;
! #if defined(HAVE_TZNAME) && !defined(__GLIBC__)
  	tzset();
  #ifdef PYOS_OS2
--- 600,604 ----
  	Py_INCREF(d);
  	moddict = d;
! #if defined(HAVE_TZNAME) && !defined(__GLIBC__) && !defined(__CYGWIN__)
  	tzset();
  #ifdef PYOS_OS2
***************
*** 618,622 ****
  	ins(d, "daylight", PyInt_FromLong((long)daylight));
  	ins(d, "tzname", Py_BuildValue("(zz)", tzname[0], tzname[1]));
! #else /* !HAVE_TZNAME || __GLIBC__ */
  #ifdef HAVE_TM_ZONE
  	{
--- 618,622 ----
  	ins(d, "daylight", PyInt_FromLong((long)daylight));
  	ins(d, "tzname", Py_BuildValue("(zz)", tzname[0], tzname[1]));
! #else /* !HAVE_TZNAME || __GLIBC__ || __CYGWIN__*/
  #ifdef HAVE_TM_ZONE
  	{
***************
*** 674,678 ****
  	ins(d, "tzname", Py_BuildValue("(zz)", _tzname[0], _tzname[1]));
  #endif /* __CYGWIN__ */
! #endif /* !HAVE_TZNAME || __GLIBC__ */
  }
  
--- 674,678 ----
  	ins(d, "tzname", Py_BuildValue("(zz)", _tzname[0], _tzname[1]));
  #endif /* __CYGWIN__ */
! #endif /* !HAVE_TZNAME || __GLIBC__ || __CYGWIN__*/
  }