merge of DB-NEW

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10453 ec53bebd-3082-4978-b11e-865c3cabbd6b
2001-08-09 08:41:49 +00:00
parent 7e967c7282
commit 334c7ffa33
12 changed files with 169 additions and 75 deletions
--- a/lib/hdb/db.c
+++ b/lib/hdb/db.c
@@ -35,7 +35,13 @@

 RCSID("$Id$");

-#if defined(HAVE_DB_H) && DB_VERSION_MAJOR < 3
+#if HAVE_DB1
+
+#if defined(HAVE_DB_185_H)
+#include <db_185.h>
+#elif defined(HAVE_DB_H)
+#include <db.h>
+#endif

 static krb5_error_code
 DB_close(krb5_context context, HDB *db)
@@ -290,4 +296,4 @@ hdb_db_create(krb5_context context, HDB **db,
    return 0;
 }

-#endif
+#endif /* HAVE_DB1 */