[Python-checkins] CVS: python/nondist/sandbox/datetime datetime.c,1.6,1.7 datetime.h,1.3,1.4

Tim Peters tim_one@users.sourceforge.net
Tue, 12 Mar 2002 14:33:53 -0800


Update of /cvsroot/python/python/nondist/sandbox/datetime
In directory usw-pr-cvs1:/tmp/cvs-serv23342

Modified Files:
	datetime.c datetime.h 
Log Message:
Changes to get this to compile on Windows.  The test passes -- yippee!


Index: datetime.c
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/datetime/datetime.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** datetime.c	6 Mar 2002 05:53:34 -0000	1.6
--- datetime.c	12 Mar 2002 22:33:51 -0000	1.7
***************
*** 32,35 ****
--- 32,37 ----
                                 ((o)->data[9] = ((v) & 0x0000ff)))
  
+ staticforward PyTypeObject PyDateTime_Type;
+ 
  /*
   * General calendrical helper functions
***************
*** 343,348 ****
  
  
! PyTypeObject PyDateTime_Type = {
!     PyObject_HEAD_INIT(&PyType_Type)
      0,						/* ob_size */
      "datetime.datetime",			/* tp_name */
--- 345,350 ----
  
  
! statichere PyTypeObject PyDateTime_Type = {
!     PyObject_HEAD_INIT(NULL)
      0,						/* ob_size */
      "datetime.datetime",			/* tp_name */
***************
*** 399,402 ****
--- 401,406 ----
      PyObject *m;
      PyObject *d, *dt;
+ 
+     PyDateTime_Type.ob_type = &PyType_Type;
  
      if (PyType_Ready(&PyDateTime_Type) < 0)

Index: datetime.h
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/datetime/datetime.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** datetime.h	6 Mar 2002 04:05:59 -0000	1.3
--- datetime.h	12 Mar 2002 22:33:51 -0000	1.4
***************
*** 14,20 ****
  
  
- extern DL_IMPORT(PyTypeObject) PyDateTime_Type;
- 
- 
  #define PyDateTime_GET_YEAR(o)        (((PyDateTime_Object*)o)->data[0] << 8  \
                                         | ((PyDateTime_Object*)o)->data[1])
--- 14,17 ----