Commit bc0d92c9 authored by Chris Withers's avatar Chris Withers

Change void* to char* to make VC++ happy.

parent af1540ad
...@@ -88,7 +88,7 @@ process must skip such objects, rather than deactivating them. ...@@ -88,7 +88,7 @@ process must skip such objects, rather than deactivating them.
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.56 2002/04/12 22:16:20 jeremy Exp $\n"; "$Id: cPickleCache.c,v 1.57 2002/04/15 15:17:33 chrisw 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))
...@@ -182,7 +182,7 @@ object_from_ring(ccobject *self, CPersistentRing *here, const char *context) ...@@ -182,7 +182,7 @@ object_from_ring(ccobject *self, CPersistentRing *here, const char *context)
/* given a pointer to a ring slot in a cPersistent_HEAD, we want to get /* given a pointer to a ring slot in a cPersistent_HEAD, we want to get
* the pointer to the Python object that slot is embedded in. * the pointer to the Python object that slot is embedded in.
*/ */
object = (PyObject *)(((void *)here) - offsetof(cPersistentObject, ring)); object = (PyObject *)(((char *)here) - offsetof(cPersistentObject, ring));
#ifdef MUCH_RING_CHECKING #ifdef MUCH_RING_CHECKING
if (!PyExtensionInstance_Check(object)) { if (!PyExtensionInstance_Check(object)) {
......
...@@ -88,7 +88,7 @@ process must skip such objects, rather than deactivating them. ...@@ -88,7 +88,7 @@ process must skip such objects, rather than deactivating them.
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.56 2002/04/12 22:16:20 jeremy Exp $\n"; "$Id: cPickleCache.c,v 1.57 2002/04/15 15:17:33 chrisw 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))
...@@ -182,7 +182,7 @@ object_from_ring(ccobject *self, CPersistentRing *here, const char *context) ...@@ -182,7 +182,7 @@ object_from_ring(ccobject *self, CPersistentRing *here, const char *context)
/* given a pointer to a ring slot in a cPersistent_HEAD, we want to get /* given a pointer to a ring slot in a cPersistent_HEAD, we want to get
* the pointer to the Python object that slot is embedded in. * the pointer to the Python object that slot is embedded in.
*/ */
object = (PyObject *)(((void *)here) - offsetof(cPersistentObject, ring)); object = (PyObject *)(((char *)here) - offsetof(cPersistentObject, ring));
#ifdef MUCH_RING_CHECKING #ifdef MUCH_RING_CHECKING
if (!PyExtensionInstance_Check(object)) { if (!PyExtensionInstance_Check(object)) {
......
...@@ -88,7 +88,7 @@ process must skip such objects, rather than deactivating them. ...@@ -88,7 +88,7 @@ process must skip such objects, rather than deactivating them.
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.56 2002/04/12 22:16:20 jeremy Exp $\n"; "$Id: cPickleCache.c,v 1.57 2002/04/15 15:17:33 chrisw 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))
...@@ -182,7 +182,7 @@ object_from_ring(ccobject *self, CPersistentRing *here, const char *context) ...@@ -182,7 +182,7 @@ object_from_ring(ccobject *self, CPersistentRing *here, const char *context)
/* given a pointer to a ring slot in a cPersistent_HEAD, we want to get /* given a pointer to a ring slot in a cPersistent_HEAD, we want to get
* the pointer to the Python object that slot is embedded in. * the pointer to the Python object that slot is embedded in.
*/ */
object = (PyObject *)(((void *)here) - offsetof(cPersistentObject, ring)); object = (PyObject *)(((char *)here) - offsetof(cPersistentObject, ring));
#ifdef MUCH_RING_CHECKING #ifdef MUCH_RING_CHECKING
if (!PyExtensionInstance_Check(object)) { if (!PyExtensionInstance_Check(object)) {
......
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