diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2016-09-21 00:21:23 +0900 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2016-09-21 11:15:47 +0900 |
| commit | ebdae19fd226104baec712b9da9939ff82ef3c3a (patch) | |
| tree | e046c0f562fc4400480b2e3257f140e973a9ce6a /src/core/core_timing.h | |
| parent | 396a8d91a4423d9c793eeff0798d544613647511 (diff) | |
Remove empty newlines in #include blocks.
This makes clang-format useful on those.
Also add a bunch of forgotten transitive includes, which otherwise
prevented compilation.
Diffstat (limited to 'src/core/core_timing.h')
| -rw-r--r-- | src/core/core_timing.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/core_timing.h b/src/core/core_timing.h index 64fd8dcd02..b72a1b5001 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h @@ -4,7 +4,9 @@ #pragma once +#include <functional> #include <string> +#include "common/common_types.h" // This is a system to schedule events into the emulated machine's future. Time is measured // in main CPU clock cycles. @@ -19,10 +21,6 @@ // inside callback: // ScheduleEvent(periodInCycles - cycles_late, callback, "whatever") -#include <functional> - -#include "common/common_types.h" - extern int g_clock_rate_arm11; inline s64 msToCycles(int ms) { |