Merge pull request #342 from svost/c++11

[novacoin.git] / src / netbase.h

diff --git a/src/netbase.h b/src/netbase.h
index 80bd90d..14c632e 100644 (file)
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -12,11 +12,6 @@
 
 extern int nConnectTimeout;
 
-#ifdef WIN32
-// In MSVC, this is defined as a macro, undefine it to prevent a compile and link error
-#undef SetPort
-#endif
-
 enum Network
 {
     NET_UNROUTABLE,
@@ -103,7 +98,7 @@ class CService : public CNetAddr
         explicit CService(const std::string& strIpPort, uint16_t portDefault, bool fAllowLookup = false);
         explicit CService(const std::string& strIpPort, bool fAllowLookup = false);
         void Init();
-        void SetPort(uint16_t portIn);
+        void SetupPort(uint16_t portIn);
         uint16_t GetPort() const;
         bool GetSockAddr(struct sockaddr* paddr, socklen_t *addrlen) const;
         bool SetSockAddr(const struct sockaddr* paddr);