diff options
| author | Stefan Boberg <[email protected]> | 2021-10-20 19:57:41 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-10-20 19:57:41 +0200 |
| commit | 1a438fe2b1d7e164988cfd21874eec5bcd0cadc3 (patch) | |
| tree | 98426126223521fd29467de0a007b0e3bfd0f0f8 /zenserver | |
| parent | zen: Improved error reporting for `print` command (diff) | |
| parent | Added missing include. (diff) | |
| download | zen-1a438fe2b1d7e164988cfd21874eec5bcd0cadc3.tar.xz zen-1a438fe2b1d7e164988cfd21874eec5bcd0cadc3.zip | |
Merge branch 'main' into gc
Diffstat (limited to 'zenserver')
| -rw-r--r-- | zenserver/diag/formatters.h | 2 | ||||
| -rw-r--r-- | zenserver/experimental/usnjournal.cpp | 2 | ||||
| -rw-r--r-- | zenserver/experimental/usnjournal.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/zenserver/diag/formatters.h b/zenserver/diag/formatters.h index d55765612..42f928efe 100644 --- a/zenserver/diag/formatters.h +++ b/zenserver/diag/formatters.h @@ -3,8 +3,8 @@ #pragma once ZEN_THIRD_PARTY_INCLUDES_START -#include <fmt/format.h> #include <cpr/cpr.h> +#include <fmt/format.h> ZEN_THIRD_PARTY_INCLUDES_END template<> diff --git a/zenserver/experimental/usnjournal.cpp b/zenserver/experimental/usnjournal.cpp index d575e1779..9422dd485 100644 --- a/zenserver/experimental/usnjournal.cpp +++ b/zenserver/experimental/usnjournal.cpp @@ -7,7 +7,9 @@ #include <zencore/timer.h> #include <zencore/zencore.h> +ZEN_THIRD_PARTY_INCLUDES_START #include <atlfile.h> +ZEN_THIRD_PARTY_INCLUDES_END #include <filesystem> diff --git a/zenserver/experimental/usnjournal.h b/zenserver/experimental/usnjournal.h index 688823953..db1f59abc 100644 --- a/zenserver/experimental/usnjournal.h +++ b/zenserver/experimental/usnjournal.h @@ -2,8 +2,8 @@ #pragma once -#include <zencore/zencore.h> #include <zencore/windows.h> +#include <zencore/zencore.h> ZEN_THIRD_PARTY_INCLUDES_START #include <winioctl.h> |