[Python-checkins] python/dist/src/Modules timemodule.c,2.125,2.126

jackjansen@sourceforge.net jackjansen@sourceforge.net
Thu, 11 Apr 2002 13:44:08 -0700


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

Modified Files:
	timemodule.c 
Log Message:
Got rid of ifdefs for long-obsolete GUSI versions.

Index: timemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/timemodule.c,v
retrieving revision 2.125
retrieving revision 2.126
diff -C2 -d -r2.125 -r2.126
*** timemodule.c	1 Apr 2002 14:49:59 -0000	2.125
--- timemodule.c	11 Apr 2002 20:44:06 -0000	2.126
***************
*** 10,20 ****
  #include <time.h>
  #include <OSUtils.h>
- #ifdef USE_GUSI211
- /* GUSI, the I/O library which has the time() function and such uses the
- ** Mac epoch of 1904. MSL, the C library which has localtime() and so uses
- ** the ANSI epoch of 1900.
- */
- #define GUSI_TO_MSL_EPOCH (4*365*24*60*60)
- #endif /* USE_GUSI2 */
  #else
  #include <sys/types.h>
--- 10,13 ----
***************
*** 260,266 ****
  	struct tm *p;
  	errno = 0;
- #if defined(macintosh) && defined(USE_GUSI204)
- 	when = when + GUSI_TO_MSL_EPOCH;
- #endif
  	p = function(&when);
  	if (p == NULL) {
--- 253,256 ----
***************
*** 488,494 ****
  		tt = (time_t)dt;
  	}
- #if defined(macintosh) && defined(USE_GUSI204)
- 	tt = tt + GUSI_TO_MSL_EPOCH;
- #endif
  	p = ctime(&tt);
  	if (p == NULL) {
--- 478,481 ----
***************
*** 527,533 ****
  		return NULL;
  	}
- #if defined(macintosh) && defined(USE_GUSI211)
- 	tt = tt - GUSI_TO_MSL_EPOCH;
- #endif
  	return PyFloat_FromDouble((double)tt);
  }
--- 514,517 ----