From 4adfda64c1f59a40ca1331ad457129c7184a2a5d Mon Sep 17 00:00:00 2001 From: Anonymous275 Date: Thu, 24 Dec 2020 00:16:40 +0200 Subject: [PATCH] Switched to msvc 2019 --- CMakeLists.txt | 2 +- include/Security/Enc.h | 4 +++- include/UnixCompat.h | 1 - src/Enc.cpp | 3 +-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01bb114..b17cb4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.18) project(Server) set(CMAKE_CXX_STANDARD 17) diff --git a/include/Security/Enc.h b/include/Security/Enc.h index 0eac781..66427fc 100644 --- a/include/Security/Enc.h +++ b/include/Security/Enc.h @@ -8,6 +8,8 @@ #pragma once #ifdef __linux #define EXCEPTION_POINTERS void +#else +#include #endif #include -int Handle(void* ep, char* Origin); +int Handle(EXCEPTION_POINTERS* ep, char* Origin); diff --git a/include/UnixCompat.h b/include/UnixCompat.h index f9cab8f..ede9332 100644 --- a/include/UnixCompat.h +++ b/include/UnixCompat.h @@ -30,7 +30,6 @@ inline void CloseSocketProper(int socket) { #endif #else // win32 - inline void CloseSocketProper(uint64_t socket) { shutdown(socket, SD_BOTH); closesocket(socket); diff --git a/src/Enc.cpp b/src/Enc.cpp index 0b0bb27..16123ce 100644 --- a/src/Enc.cpp +++ b/src/Enc.cpp @@ -7,10 +7,9 @@ /// #include "Security/Enc.h" #include "CustomAssert.h" +#include #include "Logger.h" #include -#include - #ifdef WIN32 int Handle(EXCEPTION_POINTERS* ep, char* Origin) {