--- BDB/BDB.xs	2007/08/13 11:16:22	1.15
+++ BDB/BDB.xs	2007/08/13 12:01:45	1.16
@@ -47,6 +47,16 @@
 
 static SV *prepare_cb;
 
+#if DB_VERSION_MINOR >= 6
+# define c_close close 
+# define c_count count 
+# define c_del   del   
+# define c_dup   dup   
+# define c_get   get   
+# define c_pget  pget  
+# define c_put   put   
+#endif
+
 static void
 debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg)
 {
@@ -1076,7 +1086,15 @@
           const_iv (TXN_SNAPSHOT)
 #endif
 #if DB_VERSION_MINOR >= 6
-          const_iv (DB_PREV_DUP)
+          const_iv (PREV_DUP)
+# if 0
+          const_iv (PRIORITY_UNCHANGED)
+          const_iv (PRIORITY_VERY_LOW)
+          const_iv (PRIORITY_LOW)
+          const_iv (PRIORITY_DEFAULT)
+          const_iv (PRIORITY_HIGH)
+          const_iv (PRIORITY_VERY_HIGH)
+# endif
 #endif
         };
 
@@ -1671,11 +1689,11 @@
 	OUTPUT:
         RETVAL
 
-void set_errfile (DB_ENV *env, FILE *errfile)
+void set_errfile (DB_ENV *env, FILE *errfile = 0)
 	CODE:
         env->set_errfile (env, errfile);
 
-void set_msgfile (DB_ENV *env, FILE *msgfile)
+void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
 	CODE:
         env->set_msgfile (env, msgfile);
 
@@ -1778,7 +1796,7 @@
 	OUTPUT:
         RETVAL
 
-int set_flags (DB *db, U32 flags);
+int set_flags (DB *db, U32 flags)
 	CODE:
         RETVAL = db->set_flags (db, flags);
 	OUTPUT:
@@ -1802,7 +1820,7 @@
 	OUTPUT:
         RETVAL
 
-int set_re_delim(DB *db, int delim);
+int set_re_delim (DB *db, int delim)
 	CODE:
         RETVAL = db->set_re_delim (db, delim);
 	OUTPUT: