aboutsummaryrefslogtreecommitdiff
path: root/src/protocol.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2011-10-09 20:26:40 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2011-10-09 20:26:40 +0200
commit8828da5f56313855e19f463ff1c09196812b997b (patch)
treee54e27b1a7d5287bbe245189c3044cc1a19ba02b /src/protocol.cpp
parentba2db7262bec34d45c75c6842c3a1c0cfaba893e (diff)
parent4db9705dd839cbb386398b1eb4be2a67357c27c4 (diff)
downloadbitcoin-8828da5f56313855e19f463ff1c09196812b997b.tar.xz
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'src/protocol.cpp')
-rw-r--r--src/protocol.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/protocol.cpp b/src/protocol.cpp
index 48784b9cfb..f46570e21c 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -6,7 +6,7 @@
#include "protocol.h"
#include "util.h"
-#ifndef __WXMSW__
+#ifndef WIN32
# include <arpa/inet.h>
#endif