aboutsummaryrefslogtreecommitdiff
path: root/src/crypter.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/crypter.cpp
parentba2db7262bec34d45c75c6842c3a1c0cfaba893e (diff)
parent4db9705dd839cbb386398b1eb4be2a67357c27c4 (diff)
downloadbitcoin-8828da5f56313855e19f463ff1c09196812b997b.tar.xz
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'src/crypter.cpp')
-rw-r--r--src/crypter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/crypter.cpp b/src/crypter.cpp
index 9a8e6ca89a..bee7a3624b 100644
--- a/src/crypter.cpp
+++ b/src/crypter.cpp
@@ -7,7 +7,7 @@
#include <vector>
#include <string>
#include "headers.h"
-#ifdef __WXMSW__
+#ifdef WIN32
#include <windows.h>
#endif