diff options
| author | Stefan Boberg <[email protected]> | 2021-10-15 17:33:48 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-10-15 17:33:48 +0200 |
| commit | 8a80bf1336457f8b8f9ff03fbe21a1a55b939721 (patch) | |
| tree | 4b16edfcccb936815db683db11a1dbefd517fe34 | |
| parent | Fixed logic for picking a default http implementation, which was caused by in... (diff) | |
| download | zen-8a80bf1336457f8b8f9ff03fbe21a1a55b939721.tar.xz zen-8a80bf1336457f8b8f9ff03fbe21a1a55b939721.zip | |
Fixed up some more windows include issues
| -rw-r--r-- | zencore/include/zencore/compactbinarypackage.h | 5 | ||||
| -rw-r--r-- | zencore/include/zencore/logging.h | 1 | ||||
| -rw-r--r-- | zenhttp/include/zenhttp/httpserver.h | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/zencore/include/zencore/compactbinarypackage.h b/zencore/include/zencore/compactbinarypackage.h index cc2c4815a..3fb85beb3 100644 --- a/zencore/include/zencore/compactbinarypackage.h +++ b/zencore/include/zencore/compactbinarypackage.h @@ -12,6 +12,11 @@ #include <span> #include <variant> +#ifdef GetObject +# error "windows.h pollution" +# undef GetObject +#endif + namespace zen { class CbWriter; diff --git a/zencore/include/zencore/logging.h b/zencore/include/zencore/logging.h index 5a038dd3c..0b080cb9d 100644 --- a/zencore/include/zencore/logging.h +++ b/zencore/include/zencore/logging.h @@ -6,6 +6,7 @@ ZEN_THIRD_PARTY_INCLUDES_START #include <spdlog/spdlog.h> +#undef GetObject ZEN_THIRD_PARTY_INCLUDES_END #include <string_view> diff --git a/zenhttp/include/zenhttp/httpserver.h b/zenhttp/include/zenhttp/httpserver.h index 55bd08a8e..93ba452c7 100644 --- a/zenhttp/include/zenhttp/httpserver.h +++ b/zenhttp/include/zenhttp/httpserver.h @@ -4,14 +4,13 @@ #include "zenhttp.h" -#include <zenhttp/httpcommon.h> - #include <zencore/enumflags.h> #include <zencore/iobuffer.h> #include <zencore/iohash.h> #include <zencore/refcount.h> #include <zencore/string.h> #include <zencore/uid.h> +#include <zenhttp/httpcommon.h> #include <functional> #include <gsl/gsl-lite.hpp> |