[Stackless-checkins] CVS: slpdev/src/2.3/src/Objects descrobject.c, 1.9, 1.10 fileobject.c, 1.4, 1.5 typeobject.c, 1.12, 1.13

Christian Tismer tismer at centera.de
Mon Dec 19 15:26:43 CET 2005


Update of /home/cvs/slpdev/src/2.3/src/Objects
In directory centera.de:/tmp/cvs-serv23512/src/2.3/src/Objects

Modified Files:
	descrobject.c fileobject.c typeobject.c 
Log Message:
compatibility patches for 64 bit, partially taken from CCP

Index: descrobject.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/src/Objects/descrobject.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** descrobject.c	5 Apr 2004 17:17:36 -0000	1.9
--- descrobject.c	19 Dec 2005 14:26:41 -0000	1.10
***************
*** 963,969 ****
--- 963,977 ----
  }
  
+ static PyObject *
+ wrapper_self(wrapperobject *wp)
+ {
+ 	Py_INCREF(wp->self);
+ 	return wp->self;
+ }
+ 
  static PyGetSetDef wrapper_getsets[] = {
  	{"__name__", (getter)wrapper_name},
  	{"__doc__", (getter)wrapper_doc},
+ 	{"__self__", (getter)wrapper_self},
  	{0}
  };

Index: fileobject.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/src/Objects/fileobject.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fileobject.c	14 Jan 2004 19:11:08 -0000	1.4
--- fileobject.c	19 Dec 2005 14:26:41 -0000	1.5
***************
*** 146,149 ****
--- 146,168 ----
  }
  
+ #if defined _MSC_VER && _MSC_VER>=1400
+ int verify_mode(const char *mode)
+ {
+ 	if (!strlen(mode)) return 1;
+ 	if (*mode != 'r' && *mode != 'w' && *mode != 'a')
+ 		goto ERR;
+ 	mode++;
+ 	if (*mode == '+')
+ 		mode++;
+ 	if (*mode == 'b')
+ 		mode++;
+ 	if (!*mode)
+ 		return 2;
+ ERR:
+ 	PyErr_SetString(PyExc_ValueError, "invalid mode");
+ 	return 0;
+ }
+ #endif 
+ 
  static PyObject *
  open_the_file(PyFileObject *f, char *name, char *mode)

Index: typeobject.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/src/Objects/typeobject.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** typeobject.c	5 Apr 2004 17:17:36 -0000	1.12
--- typeobject.c	19 Dec 2005 14:26:41 -0000	1.13
***************
*** 5231,5236 ****
  	if (c != 0)
  		return c;
! 	else
! 		return a - b;
  }
  
--- 5231,5241 ----
  	if (c != 0)
  		return c;
! 	else {
! 		/* CCP mod: don't truncate pointer diff */
! 		/* return a-b; */
! 		if (a<b) return -1;
! 		if (a>b) return 1;
! 		return 0;
! 	}
  }
  


_______________________________________________
Stackless-checkins mailing list
Stackless-checkins at stackless.com
http://www.stackless.com/mailman/listinfo/stackless-checkins



More information about the Stackless-checkins mailing list