summaryrefslogtreecommitdiff
path: root/osdep
diff options
context:
space:
mode:
Diffstat (limited to 'osdep')
-rw-r--r--osdep/Phy.hpp2
-rw-r--r--osdep/UPNPClient.cpp10
2 files changed, 9 insertions, 3 deletions
diff --git a/osdep/Phy.hpp b/osdep/Phy.hpp
index 5afd715b..2ea68b9d 100644
--- a/osdep/Phy.hpp
+++ b/osdep/Phy.hpp
@@ -781,7 +781,7 @@ public:
// Causes entry to be deleted from list in poll(), ignored elsewhere
sws.type = ZT_PHY_SOCKET_CLOSED;
- if (sws.sock >= _nfds) {
+ if ((long)sws.sock >= (long)_nfds) {
long nfds = (long)_whackSendSocket;
if ((long)_whackReceiveSocket > nfds)
nfds = (long)_whackReceiveSocket;
diff --git a/osdep/UPNPClient.cpp b/osdep/UPNPClient.cpp
index 20aa9d39..ceecb3a3 100644
--- a/osdep/UPNPClient.cpp
+++ b/osdep/UPNPClient.cpp
@@ -40,8 +40,14 @@
#include "../node/Utils.hpp"
#include "UPNPClient.hpp"
-#include <miniupnpc/miniupnpc.h>
-#include <miniupnpc/upnpcommands.h>
+#ifdef __WINDOWS__
+#ifndef MINIUPNP_STATICLIB
+#define MINIUPNP_STATICLIB
+#endif
+#endif
+
+#include "../ext/bin/miniupnpc/include/miniupnpc/miniupnpc.h"
+#include "../ext/bin/miniupnpc/include/miniupnpc/upnpcommands.h"
namespace ZeroTier {