Fixed windows build

This commit is contained in:
WolverinDEV 2019-11-10 00:41:08 +01:00
parent 20201ea3de
commit 4742bd9b47
5 changed files with 12 additions and 7 deletions

2
github

@ -1 +1 @@
Subproject commit d12f51da4fc49f99d57c6525b47e949e692e6696
Subproject commit 1c482d0101207b85025e8b32dd13c706636f4d42

View File

@ -104,7 +104,7 @@ void Resolver::destroy_dns_request(Resolver::dns_request *request) {
} else {
//Threaded data has been deleted now delete the lock
lock.unlock();
delete request->threaded_lock;
request->threaded_lock = nullptr;
}
@ -309,4 +309,4 @@ bool DNSResponse::parse(std::string &error) {
this->parsed_answers.emplace_back(new response::DNSResourceRecords{this->data, head});
} while((head = head->pNext));
return true;
}
}

View File

@ -7,6 +7,8 @@
#ifdef WIN32
#include <WinSock2.h>
#define SOCK_NONBLOCK (0)
#define MSG_DONTWAIT (0)
typedef int socklen_t;
#else
#include <unistd.h>
@ -38,7 +40,7 @@ bool UDPSocket::initialize() {
u_long enabled = 0;
auto non_block_rs = ioctlsocket(this->file_descriptor, FIONBIO, &enabled);
if (non_block_rs != NO_ERROR) {
log_warn(category::connection, tr("Failed to enable noblock!"))
log_warn(category::connection, tr("Failed to enable noblock!"));
}
#endif

View File

@ -278,6 +278,9 @@ void VoiceClient::finalize_js_object() {
* @param clip_window The size how long the "overflow" counts
* @return true if lower is less than upper
*/
#ifdef max
#undef max
#endif
inline constexpr bool packet_id_less(uint16_t lower, uint16_t upper, uint16_t window) {
constexpr auto bounds = std::numeric_limits<uint16_t>::max();

View File

@ -39,7 +39,7 @@
"nodemon": "^1.19.4",
"platform-dependent-modules": "0.0.14",
"sass": "^1.23.2",
"typescript": "^3.6.4"
"typescript": "^3.7.2"
},
"dependencies": {
"@types/minimist": "^1.2.0",
@ -58,7 +58,7 @@
"extend": "^3.0.2",
"extsprintf": "^1.4.0",
"fs-extra": "^8.1.0",
"http-signature": "^1.2.0",
"http-signature": "^1.3.1",
"jquery": "^3.4.1",
"json-stringify-safe": "^5.0.1",
"jsprim": "^2.0.0",
@ -72,7 +72,7 @@
"rcedit": "^1.1.2",
"request": "^2.47.1",
"request-progress": "^3.0.0",
"request-promise": "^4.2.4",
"request-promise": "^4.2.5",
"safe-buffer": "^5.2.0",
"safer-buffer": "^2.1.2",
"sshpk": "^1.16.1",