From 88bc5f94852a0b2839a3ef4e1a6a5168d02f6b55 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sat, 11 Feb 2012 20:02:55 +0100
Subject: [PATCH] Macros for manual critical sections

---
 src/net.h  |    6 +++---
 src/util.h |    6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/net.h b/src/net.h
index 2be9541..a66bc15 100644
--- a/src/net.h
+++ b/src/net.h
@@ -279,7 +279,7 @@ public:
 
     void BeginMessage(const char* pszCommand)
     {
-        cs_vSend.Enter("cs_vSend", __FILE__, __LINE__);
+        ENTER_CRITICAL_SECTION(cs_vSend);
         if (nHeaderStart != -1)
             AbortMessage();
         nHeaderStart = vSend.size();
@@ -298,7 +298,7 @@ public:
         vSend.resize(nHeaderStart);
         nHeaderStart = -1;
         nMessageStart = -1;
-        cs_vSend.Leave();
+        LEAVE_CRITICAL_SECTION(cs_vSend);
 
         if (fDebug)
             printf("(aborted)\n");
@@ -336,7 +336,7 @@ public:
 
         nHeaderStart = -1;
         nMessageStart = -1;
-        cs_vSend.Leave();
+        LEAVE_CRITICAL_SECTION(cs_vSend);
     }
 
     void EndMessageAbortIfEmpty()
diff --git a/src/util.h b/src/util.h
index 8dcedb1..ddc8791 100644
--- a/src/util.h
+++ b/src/util.h
@@ -218,6 +218,12 @@ public:
 #define CRITICAL_BLOCK(cs)     \
     if (CCriticalBlock criticalblock = CCriticalBlock(cs, #cs, __FILE__, __LINE__))
 
+#define ENTER_CRITICAL_SECTION(cs) \
+    (cs).Enter(#cs, __FILE__, __LINE__)
+
+#define LEAVE_CRITICAL_SECTION(cs) \
+    (cs).Leave()
+
 class CTryCriticalBlock
 {
 protected:
-- 
1.7.1