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

Jack Jansen python-dev@python.org
Tue, 12 Dec 2000 14:42:40 -0800


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

Modified Files:
	timemodule.c 
Log Message:
The Mac C library (MSL from CodeWarrior 6) and I/O library (GUSI
2.1.3) finally agree on when the epoch is, so the code to convert
epochs has been disabled.


Index: timemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/timemodule.c,v
retrieving revision 2.103
retrieving revision 2.104
diff -C2 -r2.103 -r2.104
*** timemodule.c	2000/09/01 23:29:27	2.103
--- timemodule.c	2000/12/12 22:42:30	2.104
***************
*** 9,13 ****
  #include <time.h>
  #include <OSUtils.h>
! #ifdef USE_GUSI2
  /* 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
--- 9,13 ----
  #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
***************
*** 467,471 ****
  		return NULL;
  	}
! #if defined(macintosh) && defined(USE_GUSI2)
  	tt = tt - GUSI_TO_MSL_EPOCH;
  #endif
--- 467,471 ----
  		return NULL;
  	}
! #if defined(macintosh) && defined(USE_GUSI211)
  	tt = tt - GUSI_TO_MSL_EPOCH;
  #endif