From c31bf3fad499811b12d0ce9a80c0a7c95c7c2266 Mon Sep 17 00:00:00 2001 From: David Markowitz Date: Mon, 6 Jan 2025 09:23:25 -0800 Subject: [PATCH] Merge branch 'webapiv2' of https://github.com/DarkflameUniverse/DarkflameServer into webapiv2 --- dCommon/dEnums/eHTTPMethod.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dCommon/dEnums/eHTTPMethod.h b/dCommon/dEnums/eHTTPMethod.h index 1b5cd8e5..7ab84d0d 100644 --- a/dCommon/dEnums/eHTTPMethod.h +++ b/dCommon/dEnums/eHTTPMethod.h @@ -1,6 +1,16 @@ #ifndef __EHTTPMETHODS__H__ #define __EHTTPMETHODS__H__ +#include + +#include "magic_enum.hpp" +#include "dPlatforms.h" + +#ifdef DARKFLAME_PLATFORM_WIN32 +#pragma push_macro("DELETE") +#undef DELETE +#endif + enum class eHTTPMethod { GET, POST, @@ -14,4 +24,8 @@ enum class eHTTPMethod { INVALID }; -#endif // __EHTTPMETHODS__H__ \ No newline at end of file +#ifdef DARKFLAME_PLATFORM_WIN32 +#pragma pop_macro("DELETE") +#endif + +#endif // __EHTTPMETHODS__H__