Added a macro to prevent declaration of cPersistenceCAPI in

cPersistence.c to avoid compiler warnings in cPickleCache and
coptimizations.

src/Persistence/cPersistence.h

@@ -112,7 +112,9 @@ typedef struct {
   persetattr persetattro;
 } cPersistenceCAPIstruct;
 
+#ifndef DONT_USE_CPERSISTENCECAPI
 static cPersistenceCAPIstruct *cPersistenceCAPI;
+#endif
 
 #define cPersistanceModuleName "cPersistence"
 

src/Persistence/cPickleCache.c

@@ -85,13 +85,14 @@
 static char cPickleCache_doc_string[] = 
 "Defines the PickleCache used by ZODB Connection objects.\n"
 "\n"
-"$Id: cPickleCache.c,v 1.32 2001/03/28 00:35:09 jeremy Exp $\n";
+"$Id: cPickleCache.c,v 1.33 2001/03/28 14:36:30 jim Exp $\n";
 
 #define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;}
 #define UNLESS(E) if(!(E))
 #define UNLESS_ASSIGN(V,E) ASSIGN(V,E) UNLESS(V)
 #define OBJECT(O) ((PyObject*)O)
 
+#define DONT_USE_CPERSISTENCECAPI
 #include "cPersistence.h"
 #include <time.h>
 
@@ -678,7 +679,7 @@ void
 initcPickleCache(void)
 {
   PyObject *m, *d;
-  char *rev="$Revision: 1.32 $";
+  char *rev="$Revision: 1.33 $";
 
   Cctype.ob_type=&PyType_Type;
 

src/ZODB/cPersistence.h

@@ -112,7 +112,9 @@ typedef struct {
   persetattr persetattro;
 } cPersistenceCAPIstruct;
 
+#ifndef DONT_USE_CPERSISTENCECAPI
 static cPersistenceCAPIstruct *cPersistenceCAPI;
+#endif
 
 #define cPersistanceModuleName "cPersistence"
 

src/ZODB/cPickleCache.c

@@ -85,13 +85,14 @@
 static char cPickleCache_doc_string[] = 
 "Defines the PickleCache used by ZODB Connection objects.\n"
 "\n"
-"$Id: cPickleCache.c,v 1.32 2001/03/28 00:35:09 jeremy Exp $\n";
+"$Id: cPickleCache.c,v 1.33 2001/03/28 14:36:30 jim Exp $\n";
 
 #define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;}
 #define UNLESS(E) if(!(E))
 #define UNLESS_ASSIGN(V,E) ASSIGN(V,E) UNLESS(V)
 #define OBJECT(O) ((PyObject*)O)
 
+#define DONT_USE_CPERSISTENCECAPI
 #include "cPersistence.h"
 #include <time.h>
 
@@ -678,7 +679,7 @@ void
 initcPickleCache(void)
 {
   PyObject *m, *d;
-  char *rev="$Revision: 1.32 $";
+  char *rev="$Revision: 1.33 $";
 
   Cctype.ob_type=&PyType_Type;
 

src/ZODB/coptimizations.c

@@ -83,6 +83,7 @@
   
  ****************************************************************************/
 #include "Python.h"
+#define DONT_USE_CPERSISTENCECAPI
 #include "cPersistence.h"
 
 static void PyVar_Assign(PyObject **v, PyObject *e) { Py_XDECREF(*v); *v=e;}
@@ -317,7 +318,7 @@ void
 initcoptimizations(void)
 {
   PyObject *m, *d;
-  char *rev="$Revision: 1.10 $";
+  char *rev="$Revision: 1.11 $";
 
 #define make_string(S) if (! (py_ ## S=PyString_FromString(#S))) return
   make_string(_p_oid);

src/persistent/cPersistence.h

@@ -112,7 +112,9 @@ typedef struct {
   persetattr persetattro;
 } cPersistenceCAPIstruct;
 
+#ifndef DONT_USE_CPERSISTENCECAPI
 static cPersistenceCAPIstruct *cPersistenceCAPI;
+#endif
 
 #define cPersistanceModuleName "cPersistence"
 

src/persistent/cPickleCache.c

@@ -85,13 +85,14 @@
 static char cPickleCache_doc_string[] = 
 "Defines the PickleCache used by ZODB Connection objects.\n"
 "\n"
-"$Id: cPickleCache.c,v 1.32 2001/03/28 00:35:09 jeremy Exp $\n";
+"$Id: cPickleCache.c,v 1.33 2001/03/28 14:36:30 jim Exp $\n";
 
 #define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;}
 #define UNLESS(E) if(!(E))
 #define UNLESS_ASSIGN(V,E) ASSIGN(V,E) UNLESS(V)
 #define OBJECT(O) ((PyObject*)O)
 
+#define DONT_USE_CPERSISTENCECAPI
 #include "cPersistence.h"
 #include <time.h>
 
@@ -678,7 +679,7 @@ void
 initcPickleCache(void)
 {
   PyObject *m, *d;
-  char *rev="$Revision: 1.32 $";
+  char *rev="$Revision: 1.33 $";
 
   Cctype.ob_type=&PyType_Type;