Fix SF #1412837, compile failed with Watcom compiler

nnorwitz · nnorwitz · commit bab05c96049d · 2006-01-24T06:06:11.000Z
diff --git a/Objects/cobject.c b/Objects/cobject.c
@@ -100,16 +100,16 @@ PyCObject_Import(char *module_name, char *name)
 }
 
 int
-PyCObject_SetVoidPtr(PyObject *_self, void *cobj)
+PyCObject_SetVoidPtr(PyObject *self, void *cobj)
 {
-    PyCObject* self = (PyCObject*)_self;
-    if (self == NULL || !PyCObject_Check(self) ||
-	self->destructor != NULL) {
+    PyCObject* cself = (PyCObject*)self;
+    if (cself == NULL || !PyCObject_Check(cself) ||
+	cself->destructor != NULL) {
 	PyErr_SetString(PyExc_TypeError, 
 			"Invalid call to PyCObject_SetVoidPtr");
 	return 0;
     }
-    self->cobject = cobj;
+    cself->cobject = cobj;
     return 1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -100,16 +100,16 @@ PyCObject_Import(char module_name, char name)`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`int`
`103`		`-PyCObject_SetVoidPtr(PyObject _self, void cobj)`
	`103`	`+PyCObject_SetVoidPtr(PyObject self, void cobj)`
`104`	`104`	`{`
`105`		`- PyCObject* self = (PyCObject*)_self;`
`106`		`- if (self == NULL \|\| !PyCObject_Check(self) \|\|`
`107`		`- self->destructor != NULL) {`
	`105`	`+ PyCObject* cself = (PyCObject*)self;`
	`106`	`+ if (cself == NULL \|\| !PyCObject_Check(cself) \|\|`
	`107`	`+ cself->destructor != NULL) {`
`108`	`108`	`PyErr_SetString(PyExc_TypeError,`
`109`	`109`	`"Invalid call to PyCObject_SetVoidPtr");`
`110`	`110`	`return 0;`
`111`	`111`	`}`
`112`		`- self->cobject = cobj;`
	`112`	`+ cself->cobject = cobj;`
`113`	`113`	`return 1;`
`114`	`114`	`}`
`115`	`115`