diff options
| author | Per Larsson <[email protected]> | 2021-12-14 12:34:47 +0100 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2021-12-14 12:34:47 +0100 |
| commit | b6c6568e1618f10d2160d836b65e35586e3c740f (patch) | |
| tree | f6a929cf918850bbba87d0ee67cd3482b2d50e24 /zenserver/experimental | |
| parent | Fixed bug in z$ service returning partial cache records and enable small obje... (diff) | |
| parent | Partial revert b363c5b (diff) | |
| download | zen-b6c6568e1618f10d2160d836b65e35586e3c740f.tar.xz zen-b6c6568e1618f10d2160d836b65e35586e3c740f.zip | |
Merged main.
Diffstat (limited to 'zenserver/experimental')
| -rw-r--r-- | zenserver/experimental/frontend.cpp | 2 | ||||
| -rw-r--r-- | zenserver/experimental/usnjournal.cpp | 19 | ||||
| -rw-r--r-- | zenserver/experimental/usnjournal.h | 12 |
3 files changed, 21 insertions, 12 deletions
diff --git a/zenserver/experimental/frontend.cpp b/zenserver/experimental/frontend.cpp index 98d570cfe..4bd3ec90a 100644 --- a/zenserver/experimental/frontend.cpp +++ b/zenserver/experimental/frontend.cpp @@ -54,7 +54,7 @@ body { <pre> __________ _________ __ \____ / ____ ____ / _____/_/ |_ ____ _______ ____ - / / _/ __ \ / \ \_____ \ \ __\ / _ \ \_ __ \_/ __ \ + / / _/ __ \ / \ \_____ \ \ __\ / _ \ \_ __ \_/ __ \ / /_ \ ___/ | | \ / \ | | ( <_> ) | | \/\ ___/ /_______ \ \___ >|___| //_______ / |__| \____/ |__| \___ > \/ \/ \/ \/ \/ diff --git a/zenserver/experimental/usnjournal.cpp b/zenserver/experimental/usnjournal.cpp index 9422dd485..580d71e45 100644 --- a/zenserver/experimental/usnjournal.cpp +++ b/zenserver/experimental/usnjournal.cpp @@ -1,17 +1,20 @@ // Copyright Epic Games, Inc. All Rights Reserved. -#include "usnjournal.h" - -#include <zencore/except.h> -#include <zencore/logging.h> -#include <zencore/timer.h> #include <zencore/zencore.h> +#if ZEN_PLATFORM_WINDOWS + +# include "usnjournal.h" + +# include <zencore/except.h> +# include <zencore/logging.h> +# include <zencore/timer.h> + ZEN_THIRD_PARTY_INCLUDES_START -#include <atlfile.h> +# include <atlfile.h> ZEN_THIRD_PARTY_INCLUDES_END -#include <filesystem> +# include <filesystem> namespace zen { @@ -344,3 +347,5 @@ UsnJournalReader::Initialize(std::filesystem::path VolumePath) } } // namespace zen + +#endif // ZEN_PLATFORM_WINDOWS diff --git a/zenserver/experimental/usnjournal.h b/zenserver/experimental/usnjournal.h index db1f59abc..910eb7d06 100644 --- a/zenserver/experimental/usnjournal.h +++ b/zenserver/experimental/usnjournal.h @@ -2,14 +2,16 @@ #pragma once -#include <zencore/windows.h> -#include <zencore/zencore.h> +#if ZEN_PLATFORM_WINDOWS + +# include <zencore/windows.h> +# include <zencore/zencore.h> ZEN_THIRD_PARTY_INCLUDES_START -#include <winioctl.h> +# include <winioctl.h> ZEN_THIRD_PARTY_INCLUDES_END -#include <filesystem> +# include <filesystem> namespace zen { @@ -63,3 +65,5 @@ private: }; } // namespace zen + +#endif // ZEN_PLATFORM_WINDOWS |