From ef2092eac9f35b77eae250801c96dfa515c6d4b2 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@symas.com>
Date: Thu, 25 Oct 2012 05:28:55 -0700
Subject: [PATCH 1/3] MDB_DEBUG tweak for old compilers

---
 libraries/libmdb/mdb.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c
index 091e8ec569..fddcc9e12f 100644
--- a/libraries/libmdb/mdb.c
+++ b/libraries/libmdb/mdb.c
@@ -3683,15 +3683,16 @@ static void
 mdb_cursor_pop(MDB_cursor *mc)
 {
 	if (mc->mc_snum) {
-#if MDB_DEBUG
-		MDB_page	*top = mc->mc_pg[mc->mc_top];
-#endif
 		mc->mc_snum--;
 		if (mc->mc_snum)
 			mc->mc_top--;
-
+#if MDB_DEBUG
+		{
+		MDB_page	*top = mc->mc_pg[mc->mc_top];
 		DPRINTF("popped page %zu off db %u cursor %p", top->mp_pgno,
 			mc->mc_dbi, (void *) mc);
+		}
+#endif
 	}
 }
 

From b68aa3f86bf60076088d572c720373337eb6cc75 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@symas.com>
Date: Thu, 25 Oct 2012 06:54:09 -0700
Subject: [PATCH 2/3] Revert "MDB_DEBUG tweak for old compilers"

This reverts commit ef2092eac9f35b77eae250801c96dfa515c6d4b2.
---
 libraries/libmdb/mdb.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c
index fddcc9e12f..091e8ec569 100644
--- a/libraries/libmdb/mdb.c
+++ b/libraries/libmdb/mdb.c
@@ -3683,16 +3683,15 @@ static void
 mdb_cursor_pop(MDB_cursor *mc)
 {
 	if (mc->mc_snum) {
+#if MDB_DEBUG
+		MDB_page	*top = mc->mc_pg[mc->mc_top];
+#endif
 		mc->mc_snum--;
 		if (mc->mc_snum)
 			mc->mc_top--;
-#if MDB_DEBUG
-		{
-		MDB_page	*top = mc->mc_pg[mc->mc_top];
+
 		DPRINTF("popped page %zu off db %u cursor %p", top->mp_pgno,
 			mc->mc_dbi, (void *) mc);
-		}
-#endif
 	}
 }
 

From 0108327c274a4b260b5b355d2a7c3ffc3a85f4c1 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@symas.com>
Date: Thu, 25 Oct 2012 06:55:46 -0700
Subject: [PATCH 3/3] Better fix for MDB_DEBUG tweak -- from hbf

---
 libraries/libmdb/mdb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c
index 091e8ec569..e1a8689efc 100644
--- a/libraries/libmdb/mdb.c
+++ b/libraries/libmdb/mdb.c
@@ -297,6 +297,7 @@ static txnid_t mdb_debug_start;
 	 fprintf(stderr, "%s:%d " fmt "\n", __func__, __LINE__, __VA_ARGS__)))
 #else
 # define DPRINTF(fmt, ...)	((void) 0)
+# define MDB_DEBUG_SKIP
 #endif
 	/**	Print a debug string.
 	 *	The string is printed literally, with no format processing.
@@ -3683,7 +3684,7 @@ static void
 mdb_cursor_pop(MDB_cursor *mc)
 {
 	if (mc->mc_snum) {
-#if MDB_DEBUG
+#ifndef MDB_DEBUG_SKIP
 		MDB_page	*top = mc->mc_pg[mc->mc_top];
 #endif
 		mc->mc_snum--;