|
 |
60b7a5f |
--- Python-2.5/setup.py.db45 2006-08-09 19:42:18.000000000 -0400
|
|
|
60b7a5f |
+++ Python-2.5/setup.py 2006-12-05 16:05:43.000000000 -0500
|
|
|
60b7a5f |
@@ -606,7 +606,7 @@
|
|
|
60b7a5f |
# a release. Most open source OSes come with one or more
|
|
|
60b7a5f |
# versions of BerkeleyDB already installed.
|
|
|
60b7a5f |
|
|
|
60b7a5f |
- max_db_ver = (4, 4)
|
|
|
60b7a5f |
+ max_db_ver = (4, 5)
|
|
|
60b7a5f |
min_db_ver = (3, 3)
|
|
|
60b7a5f |
db_setup_debug = False # verbose debug prints from this script?
|
|
|
60b7a5f |
|
|
|
60b7a5f |
@@ -623,7 +623,7 @@
|
|
|
60b7a5f |
'/sw/include/db3',
|
|
|
60b7a5f |
]
|
|
|
60b7a5f |
# 4.x minor number specific paths
|
|
|
60b7a5f |
- for x in (0,1,2,3,4):
|
|
|
60b7a5f |
+ for x in (0,1,2,3,4,5):
|
|
|
60b7a5f |
db_inc_paths.append('/usr/include/db4%d' % x)
|
|
|
60b7a5f |
db_inc_paths.append('/usr/include/db4.%d' % x)
|
|
|
60b7a5f |
db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
|
|
|
60b7a5f |
--- Python-2.5/Modules/_bsddb.c.db45 2006-12-05 16:12:08.000000000 -0500
|
|
|
60b7a5f |
+++ Python-2.5/Modules/_bsddb.c 2006-12-05 16:15:44.000000000 -0500
|
|
|
60b7a5f |
@@ -4129,6 +4129,7 @@
|
|
|
60b7a5f |
}
|
|
|
60b7a5f |
|
|
|
60b7a5f |
|
|
|
60b7a5f |
+#if (DBVER < 45)
|
|
|
60b7a5f |
static PyObject*
|
|
|
60b7a5f |
DBEnv_set_lk_max(DBEnvObject* self, PyObject* args)
|
|
|
60b7a5f |
{
|
|
|
60b7a5f |
@@ -4144,7 +4145,7 @@
|
|
|
60b7a5f |
RETURN_IF_ERR();
|
|
|
60b7a5f |
RETURN_NONE();
|
|
|
60b7a5f |
}
|
|
|
60b7a5f |
-
|
|
|
60b7a5f |
+#endif
|
|
|
60b7a5f |
|
|
|
60b7a5f |
#if (DBVER >= 32)
|
|
|
60b7a5f |
|
|
|
60b7a5f |
@@ -5233,7 +5234,9 @@
|
|
|
60b7a5f |
{"set_lg_regionmax",(PyCFunction)DBEnv_set_lg_regionmax, METH_VARARGS},
|
|
|
60b7a5f |
#endif
|
|
|
60b7a5f |
{"set_lk_detect", (PyCFunction)DBEnv_set_lk_detect, METH_VARARGS},
|
|
|
60b7a5f |
+#if (DBVER <= 40)
|
|
|
60b7a5f |
{"set_lk_max", (PyCFunction)DBEnv_set_lk_max, METH_VARARGS},
|
|
|
60b7a5f |
+#endif
|
|
|
60b7a5f |
#if (DBVER >= 32)
|
|
|
60b7a5f |
{"set_lk_max_locks", (PyCFunction)DBEnv_set_lk_max_locks, METH_VARARGS},
|
|
|
60b7a5f |
{"set_lk_max_lockers", (PyCFunction)DBEnv_set_lk_max_lockers, METH_VARARGS},
|
|
|
60b7a5f |
@@ -5835,7 +5838,9 @@
|
|
|
60b7a5f |
ADD_INT(d, DB_AFTER);
|
|
|
60b7a5f |
ADD_INT(d, DB_APPEND);
|
|
|
60b7a5f |
ADD_INT(d, DB_BEFORE);
|
|
|
60b7a5f |
+#if (DBVER <= 40)
|
|
|
60b7a5f |
ADD_INT(d, DB_CACHED_COUNTS);
|
|
|
60b7a5f |
+#endif
|
|
|
60b7a5f |
#if (DBVER >= 41)
|
|
|
60b7a5f |
_addIntToDict(d, "DB_CHECKPOINT", 0);
|
|
|
60b7a5f |
#else
|
|
|
60b7a5f |
@@ -5870,7 +5875,9 @@
|
|
|
60b7a5f |
ADD_INT(d, DB_POSITION);
|
|
|
60b7a5f |
ADD_INT(d, DB_PREV);
|
|
|
60b7a5f |
ADD_INT(d, DB_PREV_NODUP);
|
|
|
60b7a5f |
+#if (DBVER <= 40)
|
|
|
60b7a5f |
ADD_INT(d, DB_RECORDCOUNT);
|
|
|
60b7a5f |
+#endif
|
|
|
60b7a5f |
ADD_INT(d, DB_SET);
|
|
|
60b7a5f |
ADD_INT(d, DB_SET_RANGE);
|
|
|
60b7a5f |
ADD_INT(d, DB_SET_RECNO);
|