update to bitcoin-git

core/include/base58.h

@@ -7,7 +7,7 @@
 // Why base-58 instead of standard base-64 encoding?
 // - Don't want 0OIl characters that look the same in some fonts and
 //      could be used to create visually identical looking account numbers.
-// - A std::string with non-alphanumeric characters is not as easily accepted as an account number.
+// - A string with non-alphanumeric characters is not as easily accepted as an account number.
 // - E-mail usually won't line-break if there's no punctuation to break at.
 // - Doubleclicking selects the whole number as one word if it's all alphanumeric.
 //
@@ -74,7 +74,7 @@ inline bool DecodeBase58(const char* psz, std::vector<unsigned char>& vchRet)
     while (isspace(*psz))
         psz++;
 
-    // Convert big endian std::string to bignum
+    // Convert big endian string to bignum
     for (const char* p = psz; *p; p++)
     {
         const char* p1 = strchr(pszBase58, *p);

core/include/net.h

@@ -6,9 +6,12 @@
 
 #include <deque>
 #include <boost/array.hpp>
-#include <arpa/inet.h>
 #include <openssl/rand.h>
 
+#ifndef __WXMSW__
+#include <arpa/inet.h>
+#endif
+
 class CMessageHeader;
 class CAddress;
 class CInv;

core/include/util.h

@@ -5,11 +5,12 @@
 #define BITCOIN_UTIL_H
 
 #include "uint256.h"
-//#include "cryptopp/sha.h"
 
+#ifndef __WXMSW__
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
+#endif
 #include <map>
 #include <vector>
 #include <string>