cyrus-imapd/cyrus-imapd-2.5.16-conflicting-types-gettid.patch

48 lines
1.2 KiB
Diff

--- cyrus-imapd-2.5.16/lib/cyrusdb_berkeley.c.orig 2020-12-13 20:54:41.613236660 +0100
+++ cyrus-imapd-2.5.16/lib/cyrusdb_berkeley.c 2020-12-13 20:55:11.088806587 +0100
@@ -456,7 +456,7 @@
return r;
}
-static int gettid(struct txn **mytid, DB_TXN **tid, const char *where)
+static int mygettid(struct txn **mytid, DB_TXN **tid, const char *where)
{
int r;
@@ -499,7 +499,7 @@
if (data) *data = NULL;
if (datalen) *datalen = 0;
- r = gettid(mytid, &tid, "myfetch");
+ r = mygettid(mytid, &tid, "myfetch");
if (r) return r;
memset(&k, 0, sizeof(k));
@@ -594,7 +594,7 @@
/* k.flags |= DB_DBT_REALLOC;
d.flags |= DB_DBT_REALLOC;*/
- r = gettid(mytid, &tid, "foreach");
+ r = mygettid(mytid, &tid, "foreach");
if (r) return r;
if (0) {
@@ -739,7 +739,7 @@
if (!data)
datalen = 0;
- r = gettid(mytid, &tid, "mystore");
+ r = mygettid(mytid, &tid, "mystore");
if (r) return r;
memset(&k, 0, sizeof(k));
@@ -852,7 +852,7 @@
assert(dbinit && db);
assert(key && keylen);
- r = gettid(mytid, &tid, "delete");
+ r = mygettid(mytid, &tid, "delete");
if (r) return r;
memset(&k, 0, sizeof(k));