summaryrefslogtreecommitdiff
path: root/src/libicalss
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-21 15:46:52 -0400
commit48c2012eeb67f805ebadabcd877144caa07e1f9e (patch)
tree3e08aef95a70c424362293bef028035cdc69fd27 /src/libicalss
parent8af29ffa5c5a228c519efbe08762ab59172fc76a (diff)
downloadlibical-git-48c2012eeb67f805ebadabcd877144caa07e1f9e.tar.gz
libicalss/icalbdbset.c - more fix builds against BerkeleyDB v6
Diffstat (limited to 'src/libicalss')
-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 b7c7ff7b..f06b38e7 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);
}