From b9e00e8aa8629075a611f6be9c74728470e5e29a Mon Sep 17 00:00:00 2001
From: Hallvard Furuseth <hallvard@openldap.org>
Date: Fri, 9 Mar 2012 19:30:34 +0100
Subject: [PATCH] Fix MDB_txninfo.mt2 padding on Windows/Apple
---
libraries/libmdb/mdb.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c
index 4e3d70dc13..b714119c10 100644
--- a/libraries/libmdb/mdb.c
+++ b/libraries/libmdb/mdb.c
@@ -202,6 +202,8 @@
#if defined(_WIN32) || defined(__APPLE__)
#define MNAME_LEN 32
+#else
+#define MNAME_LEN (sizeof(pthread_mutex_t))
#endif
/** @} */
@@ -543,7 +545,7 @@ typedef struct MDB_txninfo {
pthread_mutex_t mt2_wmutex;
#define mti_wmutex mt2.mt2_wmutex
#endif
- char pad[(sizeof(pthread_mutex_t)+CACHELINE-1) & ~(CACHELINE-1)];
+ char pad[(MNAME_LEN+CACHELINE-1) & ~(CACHELINE-1)];
} mt2;
MDB_reader mti_readers[1];
} MDB_txninfo;
--
GitLab