summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllen Winter <allen.winter@kdab.com>2021-08-21 15:46:25 -0400
committerAllen Winter <allen.winter@kdab.com>2021-08-22 17:10:23 -0400
commit15cf1ddf5331f828adc59ac74be83c7b119f5542 (patch)
tree0e7c61e717d5c25b0b27df7412389b56b0b645e3
parentf3653b51d92e6fe4a0875b7208328b18a861f2da (diff)
downloadlibical-git-15cf1ddf5331f828adc59ac74be83c7b119f5542.tar.gz
libicalss/icalbdbset.c - more fix builds against BerkeleyDB v6
-rw-r--r--src/libicalss/icalbdbset.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libicalss/icalbdbset.c b/src/libicalss/icalbdbset.c
index 1f51a1ff..81c6e21f 100644
--- a/src/libicalss/icalbdbset.c
+++ b/src/libicalss/icalbdbset.c
@@ -31,6 +31,10 @@
#define MAX_RETRY 5
+#if !defined(DB_VERSION_MAJOR)
+#define DB_VERSION_MAJOR 1 //assume ancient version
+#endif
+
static int _compare_ids(const char *compid, const char *matchid);
#if DB_VERSION_MAJOR > 5
static int _compare_keys(DB *dbp, const DBT *a, const DBT *b, size_t *locp);
@@ -1620,7 +1624,7 @@ static int _compare_keys(DB *dbp, const DBT *a, const DBT *b)
_unused(dbp);
#if DB_VERSION_MAJOR > 5
- _unused(locp);
+ locp = NULL;
#endif
return strncmp(ac, bc, a->size);
}