From 144fd0a8d7c65a5b5bb2a0bd0a86750615bff4df Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Mon, 7 Jun 2021 13:46:29 +1000 Subject: [PATCH] Update platform-specific header includes to use pcp paths. Resolves a couple of remaining review notes from @BenBE. --- pcp/PCPProcess.c | 2 +- pcp/PCPProcessList.c | 5 +++-- pcp/Platform.c | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pcp/PCPProcess.c b/pcp/PCPProcess.c index 3b66a301..5947ee12 100644 --- a/pcp/PCPProcess.c +++ b/pcp/PCPProcess.c @@ -7,7 +7,7 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "PCPProcess.h" +#include "pcp/PCPProcess.h" #include #include diff --git a/pcp/PCPProcessList.c b/pcp/PCPProcessList.c index 0985ad2c..c7582ff6 100644 --- a/pcp/PCPProcessList.c +++ b/pcp/PCPProcessList.c @@ -9,18 +9,19 @@ in the source distribution for its full text. #include "config.h" // IWYU pragma: keep -#include "PCPProcessList.h" +#include "pcp/PCPProcessList.h" #include #include "CRT.h" #include "Macros.h" #include "Object.h" -#include "PCPProcess.h" #include "Process.h" #include "Settings.h" #include "XUtils.h" +#include "pcp/PCPProcess.h" + static int PCPProcessList_computeCPUcount(void) { int cpus; diff --git a/pcp/Platform.c b/pcp/Platform.c index f4d538df..1c2432ca 100644 --- a/pcp/Platform.c +++ b/pcp/Platform.c @@ -9,7 +9,7 @@ in the source distribution for its full text. #include "config.h" // IWYU pragma: keep -#include "Platform.h" +#include "pcp/Platform.h" #include @@ -29,8 +29,6 @@ in the source distribution for its full text. #include "NetworkIOMeter.h" #include "Object.h" #include "Panel.h" -#include "PCPProcess.h" -#include "PCPProcessList.h" #include "ProcessList.h" #include "ProvideCurses.h" #include "Settings.h" @@ -43,6 +41,8 @@ in the source distribution for its full text. #include "linux/PressureStallMeter.h" #include "linux/ZramMeter.h" #include "linux/ZramStats.h" +#include "pcp/PCPProcess.h" +#include "pcp/PCPProcessList.h" #include "zfs/ZfsArcMeter.h" #include "zfs/ZfsArcStats.h" #include "zfs/ZfsCompressedArcMeter.h"