Make compilable with Berkeley DB 3.x.

Dunno if it is a correct approach..

diff --git a/libatalk/cnid/cdb/cnid_cdb_open.c b/libatalk/cnid/cdb/cnid_cdb_open.c
index 199ce3428f8d4251a97d3f8a1f9d08efbac906c1..c72a9921bb970f6776e0c45c8649362b55b26683 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_open.c
+++ b/libatalk/cnid/cdb/cnid_cdb_open.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cnid_cdb_open.c,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_cdb_open.c,v 1.1.4.2 2003-09-16 12:20:37 rlewczuk Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -141,7 +141,11 @@ static int  my_associate (DB *p, DB *s,
 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
     return p->associate(p, NULL, s, callback, flags);
 #else
+#if DB_VERSION_MAJOR > 4
     return p->associate(p,       s, callback, flags);
+#else
+    return 0; /* FIXME */
+#endif
 #endif
 }
 

diff --git a/libatalk/cnid/cdb/cnid_cdb_update.c b/libatalk/cnid/cdb/cnid_cdb_update.c
index cdfb9809986d7c313c8a392b8104b90007075e84..ae8303ed3b69bdfe6abeb08a7f9f8c075dd5e508 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_update.c
+++ b/libatalk/cnid/cdb/cnid_cdb_update.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_update.c,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_cdb_update.c,v 1.1.4.2 2003-09-16 12:20:38 rlewczuk Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -49,7 +49,11 @@ int cnid_cdb_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st
     key.size = CNID_DEVINO_LEN;
 
     if (0 != (rc = db->db_devino->del(db->db_devino, tid, &key, 0)) ) {
+#if DB_VERSION_MAJOR >= 4
         if (rc != DB_NOTFOUND && rc != DB_SECONDARY_BAD) {
+#else
+       if (rc != DB_NOTFOUND) {
+#endif
            LOG(log_error, logtype_default, "cnid_update: Unable to del devino CNID %u, name %s: %s",
                ntohl(did), name, db_strerror(rc));
            goto fin;
@@ -62,7 +66,11 @@ int cnid_cdb_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st
     key.size = CNID_DID_LEN + len + 1;
 
     if (0 != (rc = db->db_didname->del(db->db_didname, tid, &key, 0)) ) {
+#if DB_VERSION_MAJOR >= 4
         if (rc != DB_NOTFOUND && rc != DB_SECONDARY_BAD) {
+#else
+       if (rc != DB_NOTFOUND) {
+#endif
            LOG(log_error, logtype_default, "cnid_update: Unable to del didname CNID %u, name %s: %s",
                ntohl(did), name, db_strerror(rc));
            goto fin;