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

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17653/Modules

Modified Files:
	timemodule.c 
Log Message:
Trent Mick <trentm@activestate.com>:
Mark Hammond provided (a long time ago) a better Win32 specific
time_clock implementation in timemodule.c. The library for this
implementation does not exist on Win64 (yet, at least). This patch
makes Win64 fall back on the system's clock() function for
time_clock().

This closes SourceForge patch #100512.


Index: timemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/timemodule.c,v
retrieving revision 2.84
retrieving revision 2.85
diff -C2 -r2.84 -r2.85
*** timemodule.c	2000/06/28 21:33:59	2.84
--- timemodule.c	2000/06/29 20:56:28	2.85
***************
*** 90,98 ****
  #endif /* !__WATCOMC__ || __QNX__ */
  
! #ifdef MS_WIN32
! /* Win32 has better clock replacement */
  #include <largeint.h>
  #undef HAVE_CLOCK /* We have our own version down below */
! #endif /* MS_WIN32 */
  
  #if defined(PYCC_VACPP)
--- 90,99 ----
  #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. */
  #include <largeint.h>
  #undef HAVE_CLOCK /* We have our own version down below */
! #endif /* MS_WIN32 && !MS_WIN64 */
  
  #if defined(PYCC_VACPP)
***************
*** 191,195 ****
  #endif /* HAVE_CLOCK */
  
! #ifdef MS_WIN32
  /* Due to Mark Hammond */
  static PyObject *
--- 192,196 ----
  #endif /* HAVE_CLOCK */
  
! #if defined(MS_WIN32) && !defined(MS_WIN64)
  /* Due to Mark Hammond */
  static PyObject *
***************
*** 227,231 ****
  
  #define HAVE_CLOCK /* So it gets included in the methods */
! #endif /* MS_WIN32 */
  
  #ifdef HAVE_CLOCK
--- 228,232 ----
  
  #define HAVE_CLOCK /* So it gets included in the methods */
! #endif /* MS_WIN32 && !MS_WIN64 */
  
  #ifdef HAVE_CLOCK