Commit 8a62ac14 authored by Guido van Rossum's avatar Guido van Rossum

Jeremy, did you actually try to compile this? If so, what compiler

did you use?
parent 5e57c1db
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
static char cPickleCache_doc_string[] = static char cPickleCache_doc_string[] =
"Defines the PickleCache used by ZODB Connection objects.\n" "Defines the PickleCache used by ZODB Connection objects.\n"
"\n" "\n"
"$Id: cPickleCache.c,v 1.46 2002/04/02 11:11:45 htrd Exp $\n"; "$Id: cPickleCache.c,v 1.47 2002/04/02 14:35:36 gvanrossum Exp $\n";
#define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;} #define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;}
#define UNLESS(E) if(!(E)) #define UNLESS(E) if(!(E))
...@@ -657,6 +657,8 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v) ...@@ -657,6 +657,8 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
{ {
int result; int result;
PyExtensionClass *class; PyExtensionClass *class;
PyObject *oid, *object_again;
cPersistentObject *p;
if (!PyExtensionInstance_Check(v)) { if (!PyExtensionInstance_Check(v)) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
...@@ -673,9 +675,7 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v) ...@@ -673,9 +675,7 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
} }
/* XXX Why not self->oid? */ /* XXX Why not self->oid? */
PyObject *oid = PyObject_GetAttr(v, py__p_oid); oid = PyObject_GetAttr(v, py__p_oid);
PyObject *object_again;
cPersistentObject *p;
if (oid == NULL) if (oid == NULL)
return -1; return -1;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
static char cPickleCache_doc_string[] = static char cPickleCache_doc_string[] =
"Defines the PickleCache used by ZODB Connection objects.\n" "Defines the PickleCache used by ZODB Connection objects.\n"
"\n" "\n"
"$Id: cPickleCache.c,v 1.46 2002/04/02 11:11:45 htrd Exp $\n"; "$Id: cPickleCache.c,v 1.47 2002/04/02 14:35:36 gvanrossum Exp $\n";
#define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;} #define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;}
#define UNLESS(E) if(!(E)) #define UNLESS(E) if(!(E))
...@@ -657,6 +657,8 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v) ...@@ -657,6 +657,8 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
{ {
int result; int result;
PyExtensionClass *class; PyExtensionClass *class;
PyObject *oid, *object_again;
cPersistentObject *p;
if (!PyExtensionInstance_Check(v)) { if (!PyExtensionInstance_Check(v)) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
...@@ -673,9 +675,7 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v) ...@@ -673,9 +675,7 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
} }
/* XXX Why not self->oid? */ /* XXX Why not self->oid? */
PyObject *oid = PyObject_GetAttr(v, py__p_oid); oid = PyObject_GetAttr(v, py__p_oid);
PyObject *object_again;
cPersistentObject *p;
if (oid == NULL) if (oid == NULL)
return -1; return -1;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
static char cPickleCache_doc_string[] = static char cPickleCache_doc_string[] =
"Defines the PickleCache used by ZODB Connection objects.\n" "Defines the PickleCache used by ZODB Connection objects.\n"
"\n" "\n"
"$Id: cPickleCache.c,v 1.46 2002/04/02 11:11:45 htrd Exp $\n"; "$Id: cPickleCache.c,v 1.47 2002/04/02 14:35:36 gvanrossum Exp $\n";
#define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;} #define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;}
#define UNLESS(E) if(!(E)) #define UNLESS(E) if(!(E))
...@@ -657,6 +657,8 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v) ...@@ -657,6 +657,8 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
{ {
int result; int result;
PyExtensionClass *class; PyExtensionClass *class;
PyObject *oid, *object_again;
cPersistentObject *p;
if (!PyExtensionInstance_Check(v)) { if (!PyExtensionInstance_Check(v)) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
...@@ -673,9 +675,7 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v) ...@@ -673,9 +675,7 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
} }
/* XXX Why not self->oid? */ /* XXX Why not self->oid? */
PyObject *oid = PyObject_GetAttr(v, py__p_oid); oid = PyObject_GetAttr(v, py__p_oid);
PyObject *object_again;
cPersistentObject *p;
if (oid == NULL) if (oid == NULL)
return -1; return -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment