diff --git a/src/NetworkDiscovery.cpp b/src/NetworkDiscovery.cpp index ecff2d5a86..6a46cf84c4 100644 --- a/src/NetworkDiscovery.cpp +++ b/src/NetworkDiscovery.cpp @@ -281,7 +281,7 @@ void NetworkDiscovery::arpScan(lua_State* vm) { break; } - close(mdns_sock); + closesocket(mdns_sock); } } diff --git a/src/NetworkInterface.cpp b/src/NetworkInterface.cpp index 3c10e5ac61..82465d1497 100644 --- a/src/NetworkInterface.cpp +++ b/src/NetworkInterface.cpp @@ -112,6 +112,7 @@ NetworkInterface::NetworkInterface(const char *name, if(strchr(name, ':') || strchr(name, '@') + || (!strcmp(name, "dummy")) || strchr(name, '/') /* file path */ || strstr(name, ".pcap") /* pcap */ || (strncmp(name, "lo", 2) == 0) diff --git a/third-party/LuaJIT-2.1.0-beta3/src/lj_def.h b/third-party/LuaJIT-2.1.0-beta3/src/lj_def.h index d637758dce..ee20d4fd1d 100644 --- a/third-party/LuaJIT-2.1.0-beta3/src/lj_def.h +++ b/third-party/LuaJIT-2.1.0-beta3/src/lj_def.h @@ -10,7 +10,9 @@ #if defined(_MSC_VER) /* MSVC is stuck in the last century and doesn't have C99's stdint.h. */ -//typedef __int8 int8_t; +#ifndef WIN32 +typedef __int8 int8_t; +#endif typedef __int16 int16_t; typedef __int32 int32_t; typedef __int64 int64_t; diff --git a/third-party/LuaJIT-2.1.0-beta3/src/lua.h b/third-party/LuaJIT-2.1.0-beta3/src/lua.h index 850bd796ca..3b849633b1 100644 --- a/third-party/LuaJIT-2.1.0-beta3/src/lua.h +++ b/third-party/LuaJIT-2.1.0-beta3/src/lua.h @@ -12,6 +12,10 @@ #include #include +#if defined(_MSC_VER) +/* ntop */ +#include +#endif #include "luaconf.h"