X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fnetbase.cpp;h=f4fc5372aaefa9535a35abe44330cc273cf5c37f;hb=5d2c13255d186d64a8d1feae813085436bf298a5;hp=240863c0136ece468a2b3390c206dbdbfe076934;hpb=19c7af41b5089f1696feb03379994a162bcdb730;p=novacoin.git

diff --git a/src/netbase.cpp b/src/netbase.cpp
index 240863c..f4fc537 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -9,8 +9,12 @@
 #include "hash.h"
 
 #ifndef WIN32
+#ifdef ANDROID
+#include <fcntl.h>
+#else
 #include <sys/fcntl.h>
 #endif
+#endif
 
 #ifdef _MSC_VER
 #include <BaseTsd.h>
@@ -555,7 +559,7 @@ bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest
 
 void CNetAddr::Init()
 {
-    memset(ip, 0, 16);
+    memset(ip, 0, sizeof(ip));
 }
 
 void CNetAddr::SetIP(const CNetAddr& ipIn)
@@ -921,10 +925,10 @@ std::vector<unsigned char> CNetAddr::GetGroup() const
     return vchRet;
 }
 
-uint64 CNetAddr::GetHash() const
+uint64_t CNetAddr::GetHash() const
 {
     uint256 hash = Hash(&ip[0], &ip[16]);
-    uint64 nRet;
+    uint64_t nRet;
     memcpy(&nRet, &hash, sizeof(nRet));
     return nRet;
 }