From b45477dfc47794a5897cc807f88ada7dd99305fc Mon Sep 17 00:00:00 2001 From: Alberto Garcia Illera Date: Sun, 23 Oct 2022 17:50:54 +1100 Subject: _WIN32 to WIN32 and remove already imported headers in windows --- libproxy/modules/pacrunner_duktape.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libproxy/modules/pacrunner_duktape.cpp b/libproxy/modules/pacrunner_duktape.cpp index bfa43a3..a32d946 100644 --- a/libproxy/modules/pacrunner_duktape.cpp +++ b/libproxy/modules/pacrunner_duktape.cpp @@ -19,13 +19,10 @@ ******************************************************************************/ #include "../extension_pacrunner.hpp" -#ifdef _WIN32 -#include -#include -#pragma comment(lib, "Ws2_32.lib") -#else +#ifndef WIN32 #include // gethostname #endif + using namespace libproxy; #include @@ -81,7 +78,7 @@ static duk_ret_t myIpAddress(duk_context *ctx) { class duktape_pacrunner : public pacrunner { public: duktape_pacrunner(string pac, const url& pacurl) : pacrunner(pac, pacurl) { -#ifdef _WIN32 +#ifdef WIN32 // On windows, we need to initialize the winsock dll first. WSADATA WsaData; WSAStartup(MAKEWORD(2, 0), &WsaData); @@ -114,7 +111,7 @@ public: ~duktape_pacrunner() { duk_destroy_heap(this->ctx); -#ifdef _WIN32 +#ifdef WIN32 WSACleanup(); #endif } -- cgit v1.2.1