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

[Thomas Wouters]

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

Modified Files:
      Tag: release21-maint
	timemodule.c 
Log Message:

Backport of Tim's checkin 2.111:

SF patch #418147 Fixes to allow compiling w/ Borland, from Stephen Hansen.



Index: timemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/timemodule.c,v
retrieving revision 2.110
retrieving revision 2.110.2.1
diff -C2 -r2.110 -r2.110.2.1
*** timemodule.c	2001/04/10 22:07:07	2.110
--- timemodule.c	2001/06/27 13:01:54	2.110.2.1
***************
*** 42,50 ****
  #ifdef MS_WINDOWS
  #include <windows.h>
! #ifdef MS_WIN16
  /* These overrides not needed for Win32 */
  #define timezone _timezone
  #define tzname _tzname
  #define daylight _daylight
  #define altzone _altzone
  #endif /* MS_WIN16 */
--- 42,52 ----
  #ifdef MS_WINDOWS
  #include <windows.h>
! #if defined(MS_WIN16) || defined(__BORLANDC__)
  /* These overrides not needed for Win32 */
  #define timezone _timezone
  #define tzname _tzname
  #define daylight _daylight
+ #endif /* MS_WIN16 || __BORLANDC__ */
+ #ifdef MS_WIN16
  #define altzone _altzone
  #endif /* MS_WIN16 */
***************
*** 52,56 ****
  #endif /* !__WATCOMC__ || __QNX__ */
  
! #if defined(MS_WIN32) && !defined(MS_WIN64)
  /* Win32 has better clock replacement
     XXX Win64 does not yet, but might when the platform matures. */
--- 54,58 ----
  #endif /* !__WATCOMC__ || __QNX__ */
  
! #if defined(MS_WIN32) && !defined(MS_WIN64) && !defined(__BORLANDC__)
  /* Win32 has better clock replacement
     XXX Win64 does not yet, but might when the platform matures. */
***************
*** 147,151 ****
  #endif /* HAVE_CLOCK */
  
! #if defined(MS_WIN32) && !defined(MS_WIN64)
  /* Due to Mark Hammond */
  static PyObject *
--- 149,153 ----
  #endif /* HAVE_CLOCK */
  
! #if defined(MS_WIN32) && !defined(MS_WIN64) && !defined(__BORLANDC__)
  /* Due to Mark Hammond */
  static PyObject *