From 3f86a011e6804e2fc94c3dbc9c627d0f468d787a Mon Sep 17 00:00:00 2001 From: mayurdahibhate Date: Thu, 29 Apr 2021 23:43:36 +0530 Subject: platform-dependent files included relative to main source directory --- linux/HugePageMeter.c | 4 ++-- linux/IOPriorityPanel.c | 3 ++- linux/IOPriorityPanel.h | 2 +- linux/LibSensors.c | 2 +- linux/LibSensors.h | 2 +- linux/LinuxProcess.c | 3 ++- linux/LinuxProcess.h | 2 +- linux/LinuxProcessList.c | 6 +++--- linux/Platform.c | 19 +++++++++---------- linux/PressureStallMeter.c | 2 +- linux/SELinuxMeter.c | 2 +- linux/SystemdMeter.c | 2 +- linux/ZramMeter.c | 2 +- 13 files changed, 26 insertions(+), 25 deletions(-) (limited to 'linux') diff --git a/linux/HugePageMeter.c b/linux/HugePageMeter.c index 7f79e125..cb7d9f4d 100644 --- a/linux/HugePageMeter.c +++ b/linux/HugePageMeter.c @@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "HugePageMeter.h" +#include "linux/HugePageMeter.h" #include #include @@ -13,11 +13,11 @@ in the source distribution for its full text. #include #include "CRT.h" -#include "LinuxProcessList.h" #include "Macros.h" #include "Object.h" #include "ProcessList.h" #include "RichString.h" +#include "linux/LinuxProcessList.h" static const char *HugePageMeter_active_labels[4] = { NULL, NULL, NULL, NULL }; diff --git a/linux/IOPriorityPanel.c b/linux/IOPriorityPanel.c index 25d2199d..1bcbf4ba 100644 --- a/linux/IOPriorityPanel.c +++ b/linux/IOPriorityPanel.c @@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "IOPriorityPanel.h" +#include "linux/IOPriorityPanel.h" #include #include @@ -14,6 +14,7 @@ in the source distribution for its full text. #include "ListItem.h" #include "Object.h" #include "XUtils.h" +#include "IOPriority.h" Panel* IOPriorityPanel_new(IOPriority currPrio) { diff --git a/linux/IOPriorityPanel.h b/linux/IOPriorityPanel.h index 2ac4b316..3aa76101 100644 --- a/linux/IOPriorityPanel.h +++ b/linux/IOPriorityPanel.h @@ -8,7 +8,7 @@ in the source distribution for its full text. */ #include "Panel.h" -#include "IOPriority.h" +#include "linux/IOPriority.h" Panel* IOPriorityPanel_new(IOPriority currPrio); diff --git a/linux/LibSensors.c b/linux/LibSensors.c index aa40eae2..5780c74f 100644 --- a/linux/LibSensors.c +++ b/linux/LibSensors.c @@ -1,4 +1,4 @@ -#include "LibSensors.h" +#include "linux/LibSensors.h" #ifdef HAVE_SENSORS_SENSORS_H diff --git a/linux/LibSensors.h b/linux/LibSensors.h index cceeedbf..f3410175 100644 --- a/linux/LibSensors.h +++ b/linux/LibSensors.h @@ -5,7 +5,7 @@ #include -#include "LinuxProcessList.h" +#include "linux/LinuxProcessList.h" int LibSensors_init(FILE* input); diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c index 7ccdeca6..1c8d2cfc 100644 --- a/linux/LinuxProcess.c +++ b/linux/LinuxProcess.c @@ -6,7 +6,7 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "LinuxProcess.h" +#include "linux/LinuxProcess.h" #include #include @@ -22,6 +22,7 @@ in the source distribution for its full text. #include "ProvideCurses.h" #include "RichString.h" #include "XUtils.h" +#include "linux/IOPriority.h" /* semi-global */ diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h index 3813aa18..80a20864 100644 --- a/linux/LinuxProcess.h +++ b/linux/LinuxProcess.h @@ -12,7 +12,7 @@ in the source distribution for its full text. #include -#include "IOPriority.h" +#include "linux/IOPriority.h" #include "Object.h" #include "Process.h" #include "Settings.h" diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c index 62bd792e..51999d1a 100644 --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -7,7 +7,7 @@ in the source distribution for its full text. #include "config.h" // IWYU pragma: keep -#include "LinuxProcessList.h" +#include "linux/LinuxProcessList.h" #include #include @@ -41,13 +41,13 @@ in the source distribution for its full text. #include "Compat.h" #include "CRT.h" -#include "LinuxProcess.h" #include "Macros.h" #include "Object.h" -#include "Platform.h" // needed for GNU/hurd to get PATH_MAX #include "Process.h" #include "Settings.h" #include "XUtils.h" +#include "linux/LinuxProcess.h" +#include "linux/Platform.h" // needed for GNU/hurd to get PATH_MAX #if defined(MAJOR_IN_MKDEV) #include diff --git a/linux/Platform.c b/linux/Platform.c index 0be82fc3..a888dace 100644 --- a/linux/Platform.c +++ b/linux/Platform.c @@ -7,7 +7,7 @@ in the source distribution for its full text. #include "config.h" -#include "Platform.h" +#include "linux/Platform.h" #include #include @@ -31,10 +31,6 @@ in the source distribution for its full text. #include "DiskIOMeter.h" #include "HostnameMeter.h" #include "HugePageMeter.h" -#include "IOPriority.h" -#include "IOPriorityPanel.h" -#include "LinuxProcess.h" -#include "LinuxProcessList.h" #include "LoadAverageMeter.h" #include "Macros.h" #include "MainPanel.h" @@ -46,17 +42,20 @@ in the source distribution for its full text. #include "PressureStallMeter.h" #include "ProcessList.h" #include "ProvideCurses.h" -#include "SELinuxMeter.h" +#include "linux/SELinuxMeter.h" #include "Settings.h" #include "SwapMeter.h" #include "SysArchMeter.h" -#include "SystemdMeter.h" #include "TasksMeter.h" #include "UptimeMeter.h" #include "XUtils.h" -#include "ZramMeter.h" -#include "ZramStats.h" - +#include "linux/IOPriority.h" +#include "linux/IOPriorityPanel.h" +#include "linux/LinuxProcess.h" +#include "linux/LinuxProcessList.h" +#include "linux/SystemdMeter.h" +#include "linux/ZramMeter.h" +#include "linux/ZramStats.h" #include "zfs/ZfsArcMeter.h" #include "zfs/ZfsArcStats.h" #include "zfs/ZfsCompressedArcMeter.h" diff --git a/linux/PressureStallMeter.c b/linux/PressureStallMeter.c index 573c1a3a..ff34f9b1 100644 --- a/linux/PressureStallMeter.c +++ b/linux/PressureStallMeter.c @@ -6,7 +6,7 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "PressureStallMeter.h" +#include "linux/PressureStallMeter.h" #include #include diff --git a/linux/SELinuxMeter.c b/linux/SELinuxMeter.c index 374fa5e9..e3b076d3 100644 --- a/linux/SELinuxMeter.c +++ b/linux/SELinuxMeter.c @@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "SELinuxMeter.h" +#include "linux/SELinuxMeter.h" #include "CRT.h" diff --git a/linux/SystemdMeter.c b/linux/SystemdMeter.c index 36ad40a9..8ffb6130 100644 --- a/linux/SystemdMeter.c +++ b/linux/SystemdMeter.c @@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "SystemdMeter.h" +#include "linux/SystemdMeter.h" #include #include diff --git a/linux/ZramMeter.c b/linux/ZramMeter.c index 4cfd1f79..e1e27b71 100644 --- a/linux/ZramMeter.c +++ b/linux/ZramMeter.c @@ -1,4 +1,4 @@ -#include "ZramMeter.h" +#include "linux/ZramMeter.h" #include -- cgit v1.2.3