python24/db_fix.patch

   1 Index: Modules/_bsddb.c
   2 ===================================================================
   3 --- Modules/_bsddb.c    (revision 57077)
   4 +++ Modules/_bsddb.c    (working copy)
   5 @@ -3831,6 +3831,7 @@
   6  }
   7
   8
   9 +#if (DBVER < 45)
  10  static PyObject*
  11  DBEnv_set_lk_max(DBEnvObject* self, PyObject* args)
  12  {
  13 @@ -3846,6 +3847,7 @@
  14      RETURN_IF_ERR();
  15      RETURN_NONE();
  16  }
  17 +#endif
  18
  19
  20  #if (DBVER >= 32)
  21 @@ -4532,7 +4534,9 @@
  22      {"set_lg_dir",      (PyCFunction)DBEnv_set_lg_dir,       METH_VARARGS},
  23      {"set_lg_max",      (PyCFunction)DBEnv_set_lg_max,       METH_VARARGS},
  24      {"set_lk_detect",   (PyCFunction)DBEnv_set_lk_detect,    METH_VARARGS},
  25 +#if (DBVER < 45)
  26      {"set_lk_max",      (PyCFunction)DBEnv_set_lk_max,       METH_VARARGS},
  27 +#endif
  28  #if (DBVER >= 32)
  29      {"set_lk_max_locks", (PyCFunction)DBEnv_set_lk_max_locks, METH_VARARGS},
  30      {"set_lk_max_lockers", (PyCFunction)DBEnv_set_lk_max_lockers, METH_VARARGS},
  31 @@ -5039,7 +5043,9 @@
  32      ADD_INT(d, DB_AFTER);
  33      ADD_INT(d, DB_APPEND);
  34      ADD_INT(d, DB_BEFORE);
  35 +#if (DBVER < 45)
  36      ADD_INT(d, DB_CACHED_COUNTS);
  37 +#endif
  38  #if (DBVER >= 41)
  39      _addIntToDict(d, "DB_CHECKPOINT", 0);
  40  #else
  41 @@ -5074,7 +5080,9 @@
  42      ADD_INT(d, DB_POSITION);
  43      ADD_INT(d, DB_PREV);
  44      ADD_INT(d, DB_PREV_NODUP);
  45 +#if (DBVER < 45)
  46      ADD_INT(d, DB_RECORDCOUNT);
  47 +#endif
  48      ADD_INT(d, DB_SET);
  49      ADD_INT(d, DB_SET_RANGE);
  50      ADD_INT(d, DB_SET_RECNO);