diff options
| author | Stefan Boberg <[email protected]> | 2021-10-20 16:11:13 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-10-20 16:11:13 +0200 |
| commit | e67c332cc289768885334dc46a9ff3dd99874abe (patch) | |
| tree | c2bb2132c1f6c8a896511373f8952963c3d98bc0 /zenserver | |
| parent | Added ZEN_THIRD_PARTY_INCLUDES_START to prevent compilation issues (diff) | |
| parent | Format fix. (diff) | |
| download | zen-e67c332cc289768885334dc46a9ff3dd99874abe.tar.xz zen-e67c332cc289768885334dc46a9ff3dd99874abe.zip | |
Merge branch 'main' of https://github.com/EpicGames/zen into main
Diffstat (limited to 'zenserver')
| -rw-r--r-- | zenserver/diag/formatters.h | 2 | ||||
| -rw-r--r-- | zenserver/experimental/usnjournal.h | 2 |
2 files changed, 2 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.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> |