[Python-checkins] python/dist/src/Modules _bsddb.c,1.39,1.40

Thu Dec 16 10:47:31 CET 2004

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19617/extsrc
Modified Files:
	_bsddb.c 
Log Message:
fixed compilation against BerkeleyDB 3.2.9 (sf bug # 1077040)
Index: _bsddb.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_bsddb.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40

--- _bsddb.c	13 Dec 2004 09:51:23 -0000	1.39
+++ _bsddb.c	16 Dec 2004 09:47:28 -0000	1.40
@@ -1448,6 +1448,7 @@
 return retval;
 }
 
+#if (DBVER >= 33)
 static PyObject*
 DB_pget(DBObject* self, PyObject* args, PyObject* kwargs)
 {
@@ -1535,6 +1536,7 @@
 RETURN_IF_ERR();
 return retval;
 }
+#endif
 
 
 /* Return size of entry */
@@ -2918,6 +2920,7 @@
 return retval;
 }
 
+#if (DBVER >= 33)
 static PyObject*
 DBC_pget(DBCursorObject* self, PyObject* args, PyObject *kwargs)
 {
@@ -3017,6 +3020,7 @@
 }
 return retval;
 }
+#endif
 
 
 static PyObject*
@@ -4379,7 +4383,9 @@
 {"delete", (PyCFunction)DB_delete, METH_VARARGS|METH_KEYWORDS},
 {"fd", (PyCFunction)DB_fd, METH_VARARGS},
 {"get", (PyCFunction)DB_get, METH_VARARGS|METH_KEYWORDS},
+#if (DBVER >= 33)
 {"pget", (PyCFunction)DB_pget, METH_VARARGS|METH_KEYWORDS},
+#endif
 {"get_both", (PyCFunction)DB_get_both, METH_VARARGS|METH_KEYWORDS},
 {"get_byteswapped", (PyCFunction)DB_get_byteswapped,METH_VARARGS},
 {"get_size", (PyCFunction)DB_get_size, METH_VARARGS|METH_KEYWORDS},
@@ -4439,7 +4445,9 @@
 {"dup", (PyCFunction)DBC_dup, METH_VARARGS},
 {"first", (PyCFunction)DBC_first, METH_VARARGS|METH_KEYWORDS},
 {"get", (PyCFunction)DBC_get, METH_VARARGS|METH_KEYWORDS},
+#if (DBVER >= 33)
 {"pget", (PyCFunction)DBC_pget, METH_VARARGS|METH_KEYWORDS},
+#endif
 {"get_recno", (PyCFunction)DBC_get_recno, METH_VARARGS},
 {"last", (PyCFunction)DBC_last, METH_VARARGS|METH_KEYWORDS},
 {"next", (PyCFunction)DBC_next, METH_VARARGS|METH_KEYWORDS},
