Bugfix: Replace "URL" with "URI" where we aren't actually working with URLs

[novacoin.git] / src / netbase.h

diff --git a/src/netbase.h b/src/netbase.h
index e65e138..9e79de4 100644 (file)
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -9,6 +9,10 @@
 
 #ifdef WIN32
 #define _WIN32_WINNT 0x0501
+#define WIN32_LEAN_AND_MEAN 1
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #include <winsock2.h>
 #include <mswsock.h>
 #include <ws2tcpip.h>
@@ -29,8 +33,12 @@
 
 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
 
-// IP address (IPv6, or IPv4 using mapped IPv6 range (::FFFF:0:0/96))
+/** IP address (IPv6, or IPv4 using mapped IPv6 range (::FFFF:0:0/96)) */
 class CNetAddr
 {
     protected:
@@ -81,6 +89,7 @@ class CNetAddr
             )
 };
 
+/** A combination of a network address (CNetAddr) and a (TCP) port */
 class CService : public CNetAddr
 {
     protected: