From 72ae55981bfcd6f93b9e015b0abf82ba6628d694 Mon Sep 17 00:00:00 2001 From: Aaron Kimbre Date: Mon, 6 Jan 2025 13:55:43 -0600 Subject: [PATCH] fix here too --- dChatServer/ChatWebAPI.cpp | 10 +++++++++- dCommon/dEnums/eHTTPMethod.h | 5 ----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dChatServer/ChatWebAPI.cpp b/dChatServer/ChatWebAPI.cpp index d12d1fe5..0b87bece 100644 --- a/dChatServer/ChatWebAPI.cpp +++ b/dChatServer/ChatWebAPI.cpp @@ -14,9 +14,13 @@ #include "eHTTPStatusCode.h" #include "magic_enum.hpp" #include "ChatPackets.h" - #include "StringifiedEnum.h" +#ifdef DARKFLAME_PLATFORM_WIN32 +#pragma push_macro("DELETE") +#undef DELETE +#endif + using json = nlohmann::json; typedef struct mg_connection mg_connection; @@ -170,6 +174,10 @@ void HandleRequests(mg_connection* connection, int request, void* request_data) } } +#ifdef DARKFLAME_PLATFORM_WIN32 +#pragma pop_macro("DELETE") +#endif + ChatWebAPI::ChatWebAPI() { mg_log_set(MG_LL_NONE); mg_mgr_init(&mgr); // Initialize event manager diff --git a/dCommon/dEnums/eHTTPMethod.h b/dCommon/dEnums/eHTTPMethod.h index 7ab84d0d..8fd01379 100644 --- a/dCommon/dEnums/eHTTPMethod.h +++ b/dCommon/dEnums/eHTTPMethod.h @@ -1,11 +1,6 @@ #ifndef __EHTTPMETHODS__H__ #define __EHTTPMETHODS__H__ -#include - -#include "magic_enum.hpp" -#include "dPlatforms.h" - #ifdef DARKFLAME_PLATFORM_WIN32 #pragma push_macro("DELETE") #undef DELETE