diff options
| author | Martin Ridgers <[email protected]> | 2021-10-16 10:53:54 +0200 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-10-16 10:53:54 +0200 |
| commit | 8030078d08379d011781c8c09d6840fc24aaec23 (patch) | |
| tree | 15c5f9b4032140211f34713a034e36ce4b697f78 /zenserver-test/zenserver-test.cpp | |
| parent | Merged main (diff) | |
| parent | Fixed up some more windows include issues (diff) | |
| download | zen-8030078d08379d011781c8c09d6840fc24aaec23.tar.xz zen-8030078d08379d011781c8c09d6840fc24aaec23.zip | |
Merged main
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 19770e05f..0f9026e76 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() |