[Python-checkins] CVS: python/dist/src/Objects abstract.c,2.46,2.47

[Thomas Wouters]

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

Modified Files:
	abstract.c 
Log Message:

Addendum to previous change: now that 'f' is not unconditionally
initialized in the 'if (..)', do so manually.



Index: abstract.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/abstract.c,v
retrieving revision 2.46
retrieving revision 2.47
diff -C2 -r2.46 -r2.47
*** abstract.c	2000/08/23 23:16:10	2.46
--- abstract.c	2000/08/23 23:31:34	2.47
***************
*** 292,296 ****
  	if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *);
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
--- 292,296 ----
  	if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *) = NULL;
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
***************
*** 312,316 ****
  	if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *);
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
--- 312,316 ----
  	if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *) = NULL;
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
***************
*** 332,336 ****
  	if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *);
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
--- 332,336 ----
  	if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *) = NULL;
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
***************
*** 352,356 ****
  	if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *);
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
--- 352,356 ----
  	if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *) = NULL;
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
***************
*** 372,376 ****
  	if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *);
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
--- 372,376 ----
  	if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *) = NULL;
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
***************
*** 397,401 ****
  	else if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *);
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
--- 397,401 ----
  	else if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *) = NULL;
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
***************
*** 417,421 ****
  	if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *);
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
--- 417,421 ----
  	if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *) = NULL;
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
***************
*** 448,452 ****
  	if (tp->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *);
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
--- 448,452 ----
  	if (tp->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *) = NULL;
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
***************
*** 486,490 ****
  	if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *);
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
--- 486,490 ----
  	if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *) = NULL;
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
***************
*** 510,514 ****
  	if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *);
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
--- 510,514 ----
  	if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *) = NULL;
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
***************
*** 530,534 ****
  	if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *);
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;
--- 530,534 ----
  	if (v->ob_type->tp_as_number != NULL) {
  		PyObject *x = NULL;
! 		PyObject * (*f)(PyObject *, PyObject *) = NULL;
  		if (PyNumber_Coerce(&v, &w) != 0)
  			return NULL;