diff options
| author | Martin Ridgers <[email protected]> | 2021-10-12 14:16:39 +0200 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-10-12 14:17:13 +0200 |
| commit | 1fc5d199509422e303935a39f85a2c7f9149d9a7 (patch) | |
| tree | 6037383bacd06bb48a1847b1e6bf7ee504f210de | |
| parent | Corrected incorrect casing of include statements (diff) | |
| download | zen-1fc5d199509422e303935a39f85a2c7f9149d9a7.tar.xz zen-1fc5d199509422e303935a39f85a2c7f9149d9a7.zip | |
Only include zencore/windows.h on Windows
| -rw-r--r-- | zenstore/compactcas.h | 5 | ||||
| -rw-r--r-- | zenstore/filecas.cpp | 10 | ||||
| -rw-r--r-- | zenstore/include/zenstore/basicfile.h | 5 | ||||
| -rw-r--r-- | zenstore/include/zenstore/caslog.h | 5 |
4 files changed, 18 insertions, 7 deletions
diff --git a/zenstore/compactcas.h b/zenstore/compactcas.h index 416542e86..47e989fe9 100644 --- a/zenstore/compactcas.h +++ b/zenstore/compactcas.h @@ -9,11 +9,14 @@ #include <zencore/string.h> #include <zencore/thread.h> #include <zencore/uid.h> -#include <zencore/windows.h> #include <zenstore/basicfile.h> #include <zenstore/CAS.h> #include <zenstore/caslog.h> +#if ZEN_PLATFORM_WINDOWS +# include <zencore/windows.h> +#endif + namespace zen { ////////////////////////////////////////////////////////////////////////// diff --git a/zenstore/filecas.cpp b/zenstore/filecas.cpp index 3e76de2f9..b63cd4ba7 100644 --- a/zenstore/filecas.cpp +++ b/zenstore/filecas.cpp @@ -23,12 +23,14 @@ #include <unordered_map> // clang-format off -#include <zencore/prewindows.h> +#if ZEN_PLATFORM_WINDOWS +# include <zencore/prewindows.h> -struct IUnknown; // Workaround for "combaseapi.h(229): error C2187: syntax error: 'identifier' was unexpected here" when using /permissive- -#include <atlfile.h> + struct IUnknown; // Workaround for "combaseapi.h(229): error C2187: syntax error: 'identifier' was unexpected here" when using /permissive- +# include <atlfile.h> -#include <zencore/postwindows.h> +# include <zencore/postwindows.h> +#endif // clang-format on namespace zen { diff --git a/zenstore/include/zenstore/basicfile.h b/zenstore/include/zenstore/basicfile.h index 7ae35dea6..87fec16c6 100644 --- a/zenstore/include/zenstore/basicfile.h +++ b/zenstore/include/zenstore/basicfile.h @@ -5,7 +5,10 @@ #include "zenstore.h" #include <zencore/iobuffer.h> -#include <zencore/windows.h> + +#if ZEN_PLATFORM_WINDOWS +# include <zencore/windows.h> +#endif #include <filesystem> #include <functional> diff --git a/zenstore/include/zenstore/caslog.h b/zenstore/include/zenstore/caslog.h index 9a163b477..8189da87e 100644 --- a/zenstore/include/zenstore/caslog.h +++ b/zenstore/include/zenstore/caslog.h @@ -8,10 +8,13 @@ #include <zencore/string.h> #include <zencore/thread.h> #include <zencore/uid.h> -#include <zencore/windows.h> #include <zenstore/basicfile.h> #include <zenstore/CAS.h> +#if ZEN_PLATFORM_WINDOWS +# include <zencore/windows.h> +#endif + #include <functional> namespace zen { |