X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fdatabase.c;h=0493d0e548a276b44f9186db994dfce26bc5a64e;hb=9e004122928715a7579fcbfaf2e85155ac78a432;hp=350f9afbcf86683a2521fd513f04963525757698;hpb=35adcaaeafb1fe93eaf00c39b48619e8f188ff3f;p=chise%2Fxemacs-chise.git

diff --git a/src/database.c b/src/database.c
index 350f9af..0493d0e 100644
--- a/src/database.c
+++ b/src/database.c
@@ -128,7 +128,7 @@ struct Lisp_Database
 static Lisp_Database *
 allocate_database (void)
 {
-  Lisp_Database *db = alloc_lcrecord_type (Lisp_Database, lrecord_database);
+  Lisp_Database *db = alloc_lcrecord_type (Lisp_Database, &lrecord_database);
 
   db->fname = Qnil;
   db->live_p = 0;
@@ -501,7 +501,11 @@ berkdb_map (Lisp_Database *db, Lisp_Object func)
   {
     DBC *dbcp;
 
+#if DB_VERSION_MAJOR > 2 || DB_VERSION_MINOR >=6
+    status = dbp->cursor (dbp, NULL, &dbcp, 0);
+#else
     status = dbp->cursor (dbp, NULL, &dbcp);
+#endif   
     for (status = dbcp->c_get (dbcp, &keydatum, &valdatum, DB_FIRST);
 	 status == 0;
 	 status = dbcp->c_get (dbcp, &keydatum, &valdatum, DB_NEXT))