summaryrefslogtreecommitdiff
path: root/node/Network.hpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@zerotier.com>2013-08-12 21:25:36 -0400
committerAdam Ierymenko <adam.ierymenko@zerotier.com>2013-08-12 21:25:36 -0400
commitd6414c9ff74e3f8076a1e94d3c6074366119900e (patch)
treeb0620f1f1610b51b386964d6758b5787b6cb7d6f /node/Network.hpp
parent5076c75b079fe02c843ca85dc20821e468b2d7b8 (diff)
downloadinfinitytier-d6414c9ff74e3f8076a1e94d3c6074366119900e.tar.gz
infinitytier-d6414c9ff74e3f8076a1e94d3c6074366119900e.zip
Windows compiles! (w/Visual Studio 2012) That's about all it does, but it's a start.
Diffstat (limited to 'node/Network.hpp')
-rw-r--r--node/Network.hpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/node/Network.hpp b/node/Network.hpp
index e80d2e65..f263cd5d 100644
--- a/node/Network.hpp
+++ b/node/Network.hpp
@@ -115,7 +115,11 @@ public:
inline uint64_t networkId() const
throw(std::invalid_argument)
{
+#ifdef __WINDOWS__
+ return _strtoui64(get("nwid").c_str(),(char **)0,16);
+#else
return strtoull(get("nwid").c_str(),(char **)0,16);
+#endif
}
inline void setPeerAddress(Address &a)
@@ -222,7 +226,11 @@ public:
inline uint64_t networkId() const
throw(std::invalid_argument)
{
+#ifdef __WINDOWS__
+ return _strtoui64(get("nwid").c_str(),(char **)0,16);
+#else
return strtoull(get("nwid").c_str(),(char **)0,16);
+#endif
}
inline Address peerAddress() const