diff options
Diffstat (limited to 'zenserver-test/zenserver-test.cpp')
| -rw-r--r-- | zenserver-test/zenserver-test.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp index fe21aa834..9c9b73042 100644 --- a/zenserver-test/zenserver-test.cpp +++ b/zenserver-test/zenserver-test.cpp @@ -23,7 +23,9 @@ #include <zenutil/zenserverprocess.h> #if ZEN_USE_MIMALLOC +ZEN_THIRD_PARTY_INCLUDES_START # include <mimalloc.h> +ZEN_THIRD_PARTY_INCLUDES_END #endif #include <http_parser.h> @@ -32,7 +34,11 @@ # pragma comment(lib, "Crypt32.lib") # pragma comment(lib, "Wldap32.lib") #endif + +ZEN_THIRD_PARTY_INCLUDES_START #include <cpr/cpr.h> +#undef GetObject +ZEN_THIRD_PARTY_INCLUDES_END #include <ppl.h> #include <atomic> @@ -594,10 +600,6 @@ private: ////////////////////////////////////////////////////////////////////////// #if 0 -# include <cpr/cpr.h> - -# pragma comment(lib, "Crypt32.lib") -# pragma comment(lib, "Wldap32.lib") int main() |