From: Gregory P. Smith <greg@mad-scientist.com>
Date: Mon, 5 Nov 2007 09:06:28 +0000 (+0000)
Subject:  * db->get_types is only available in BerkeleyDB >= 4.2
X-Git-Tag: v2.6a1~1090
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc006692ad99b1f15f5e035ff4bf4d6ad2270805;p=python

 * db->get_types is only available in BerkeleyDB >= 4.2
 * get compiling with older versions of python again for a stand alone release.
---

diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c
index d2b62a9d40..35d4b88160 100644
--- a/Modules/_bsddb.c
+++ b/Modules/_bsddb.c
@@ -203,6 +203,11 @@ static PyObject* DBPermissionsError;    /* EPERM  */
 
 staticforward PyTypeObject DB_Type, DBCursor_Type, DBEnv_Type, DBTxn_Type, DBLock_Type;
 
+#ifndef Py_Type
+/* for compatibility with Python 2.5 and earlier */
+#define Py_Type(ob)              (((PyObject*)(ob))->ob_type)
+#endif
+
 #define DBObject_Check(v)           (Py_Type(v) == &DB_Type)
 #define DBCursorObject_Check(v)     (Py_Type(v) == &DBCursor_Type)
 #define DBEnvObject_Check(v)        (Py_Type(v) == &DBEnv_Type)
@@ -1849,7 +1854,9 @@ DB_open(DBObject* self, PyObject* args, PyObject* kwargs)
         return NULL;
     }
 
+#if (DBVER >= 42)
     self->db->get_flags(self->db, &self->setflags);
+#endif
 
     self->flags = flags;
     RETURN_NONE();