Merge pull request #206 from dooglus/mingw_fix

Revert previous attempt to fix Windows RPC error. This should fix it.
nochowderforyou · Jul 25, 2015 · 8ef24ee · 8ef24ee
2 parents 4ce28b1 + c6444ab
commit 8ef24ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/rpcprotocol.cpp b/src/rpcprotocol.cpp
@@ -85,7 +85,7 @@ string HTTPReply(int nStatus, const string& strMsg, bool keepalive)
             "HTTP/1.1 %d %s\r\n"
             "Date: %s\r\n"
             "Connection: %s\r\n"
-	    "Content-Length: %" PRIszu "\r\n"
+            "Content-Length: %"PRIszu"\r\n"
             "Content-Type: application/json\r\n"
             "Server: Clam-json-rpc/%s\r\n"
             "\r\n"

diff --git a/src/util.h b/src/util.h
@@ -46,7 +46,7 @@ const int64_t COIN = CENT * 100;
 #define CUINTBEGIN(a)        ((const uint32_t*)&(a))
 
 /* Format characters for (s)size_t and ptrdiff_t */
-#if defined(_MSC_VER) || defined(__MSVCRT__)
+#if (defined(_MSC_VER) || defined(__MSVCRT__)) && !defined(__MINGW32__)
   /* (s)size_t and ptrdiff_t have the same size specifier in MSVC:
      http://msdn.microsoft.com/en-us/library/tcxf1dw6%28v=vs.100%29.aspx
    */