Merge pull request #119 from zelcash/macosfix

fix macos building
RunOnFlux · Jul 16, 2020 · 9b90aea · 9b90aea
2 parents 87fae7d + 05dc90b
commit 9b90aea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/net.cpp b/src/net.cpp
@@ -1611,7 +1611,7 @@ bool BindListenPort(const CService &addrBind, string& strError, bool fWhiteliste
         LogPrintf("%s\n", strError);
         return false;
     }
-#if defined(_WIN64) || defined(_WIN32)
+#if defined(_WIN64) || defined(_WIN32) || defined(__APPLE__)
      SOCKET hListenSocket = socket(((struct sockaddr*)&sockaddr)->sa_family, SOCK_STREAM, IPPROTO_TCP);
 #else
     SOCKET hListenSocket = socket(((struct sockaddr*)&sockaddr)->sa_family, SOCK_STREAM|SOCK_CLOEXEC, IPPROTO_TCP);

diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
@@ -695,7 +695,7 @@ class CTransaction
     }
 
     bool IsNull() const {
-        return vin.empty() && vout.empty() && !IsZelnodeTx() || (IsZelnodeTx() && collateralOut.IsNull());
+        return (vin.empty() && vout.empty() && !IsZelnodeTx()) || (IsZelnodeTx() && collateralOut.IsNull());
     }
 
     std::string TypeToString() const {