aboutsummaryrefslogtreecommitdiff
path: root/src/net.h
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-02-17 09:39:54 -0500
committerLuke Dashjr <luke-jr+git@utopios.org>2012-02-17 09:39:54 -0500
commitfdb365df0e9bf1b3073ea38212664cb59863bbd0 (patch)
tree8295f7921c90f40e561d1931eba0e4377d5055ea /src/net.h
parent0365f19dececa3bd84ae28ec4aabb955ffb8b405 (diff)
parent8960f2fc3353d5d7f8b9babd1aaef0e9869e39f4 (diff)
downloadbitcoin-fdb365df0e9bf1b3073ea38212664cb59863bbd0.tar.xz
Merge branch '0.4.x' into 0.5.0.x
Diffstat (limited to 'src/net.h')
-rw-r--r--src/net.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/net.h b/src/net.h
index 4eadeaa8aa..55f4d743dc 100644
--- a/src/net.h
+++ b/src/net.h
@@ -284,7 +284,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();
@@ -303,7 +303,7 @@ public:
vSend.resize(nHeaderStart);
nHeaderStart = -1;
nMessageStart = -1;
- cs_vSend.Leave();
+ LEAVE_CRITICAL_SECTION(cs_vSend);
if (fDebug)
printf("(aborted)\n");
@@ -341,7 +341,7 @@ public:
nHeaderStart = -1;
nMessageStart = -1;
- cs_vSend.Leave();
+ LEAVE_CRITICAL_SECTION(cs_vSend);
}
void EndMessageAbortIfEmpty()