From 1b74dfe1877676b914af6dcedd2d7578164aab47 Mon Sep 17 00:00:00 2001 From: mayurdahibhate Date: Thu, 29 Apr 2021 20:42:43 +0530 Subject: [PATCH] cleaned up includes with iwyu --- AffinityPanel.h | 1 + AvailableColumnsPanel.c | 1 - AvailableColumnsPanel.h | 1 + AvailableMetersPanel.h | 1 + BatteryMeter.h | 1 + CPUMeter.h | 1 + CategoriesPanel.h | 1 + ClockMeter.c | 2 ++ ClockMeter.h | 1 + ColorsPanel.c | 4 +--- ColorsPanel.h | 1 + ColumnsPanel.h | 1 + CommandScreen.c | 2 +- DateMeter.c | 2 ++ DateMeter.h | 1 + DateTimeMeter.c | 2 ++ DateTimeMeter.h | 1 + DiskIOMeter.c | 2 +- DiskIOMeter.h | 1 + DisplayOptionsPanel.h | 1 + EnvScreen.c | 1 - EnvScreen.h | 1 + FunctionBar.h | 1 + Hashtable.c | 1 - HostnameMeter.c | 4 +--- HostnameMeter.h | 1 + IncSet.h | 1 + InfoScreen.c | 1 - ListItem.h | 1 + LoadAverageMeter.c | 1 + LoadAverageMeter.h | 1 + MemoryMeter.c | 1 + MemoryMeter.h | 1 + Meter.c | 1 - Meter.h | 1 + NetworkIOMeter.c | 5 +++-- NetworkIOMeter.h | 1 + OpenFilesScreen.h | 1 + Process.c | 3 +-- ProcessList.c | 1 - ProcessList.h | 2 ++ RichString.c | 1 + SignalsPanel.h | 1 + SwapMeter.c | 4 ++++ SwapMeter.h | 1 + SysArchMeter.c | 7 ++++++- TasksMeter.h | 1 + TraceScreen.c | 1 - UptimeMeter.h | 1 + UsersTable.h | 1 + generic/gettime.h | 1 - generic/uname.c | 9 ++++++--- linux/HugePageMeter.c | 8 ++++++-- linux/HugePageMeter.h | 1 + linux/LinuxProcess.c | 1 + linux/LinuxProcessList.c | 1 + linux/Platform.c | 2 +- linux/Platform.h | 3 +++ linux/PressureStallMeter.h | 1 + linux/SELinuxMeter.c | 2 +- linux/SELinuxMeter.h | 1 + linux/SystemdMeter.c | 1 + linux/SystemdMeter.h | 1 + linux/ZramMeter.c | 2 ++ linux/ZramMeter.h | 1 + solaris/SolarisProcessList.c | 1 + unsupported/UnsupportedProcess.h | 1 + zfs/ZfsArcMeter.c | 2 ++ zfs/ZfsArcMeter.h | 1 + zfs/ZfsCompressedArcMeter.c | 3 ++- zfs/ZfsCompressedArcMeter.h | 1 + 71 files changed, 92 insertions(+), 29 deletions(-) diff --git a/AffinityPanel.h b/AffinityPanel.h index 3b4b0f79..183e447d 100644 --- a/AffinityPanel.h +++ b/AffinityPanel.h @@ -11,6 +11,7 @@ in the source distribution for its full text. #include "Panel.h" #include "ProcessList.h" + extern const PanelClass AffinityPanel_class; Panel* AffinityPanel_new(ProcessList* pl, const Affinity* affinity, int* width); diff --git a/AvailableColumnsPanel.c b/AvailableColumnsPanel.c index fb0357cf..04e4fa58 100644 --- a/AvailableColumnsPanel.c +++ b/AvailableColumnsPanel.c @@ -15,7 +15,6 @@ in the source distribution for its full text. #include "FunctionBar.h" #include "ListItem.h" #include "Object.h" -#include "Platform.h" #include "Process.h" #include "ProvideCurses.h" #include "XUtils.h" diff --git a/AvailableColumnsPanel.h b/AvailableColumnsPanel.h index 8672eb9e..bf87dcfb 100644 --- a/AvailableColumnsPanel.h +++ b/AvailableColumnsPanel.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include "Panel.h" + typedef struct AvailableColumnsPanel_ { Panel super; Panel* columns; diff --git a/AvailableMetersPanel.h b/AvailableMetersPanel.h index a9c0da95..5c05a297 100644 --- a/AvailableMetersPanel.h +++ b/AvailableMetersPanel.h @@ -13,6 +13,7 @@ in the source distribution for its full text. #include "ScreenManager.h" #include "Settings.h" + typedef struct AvailableMetersPanel_ { Panel super; ScreenManager* scr; diff --git a/BatteryMeter.h b/BatteryMeter.h index b6e8c520..fa6d503c 100644 --- a/BatteryMeter.h +++ b/BatteryMeter.h @@ -11,6 +11,7 @@ This meter written by Ian P. Hands (iphands@gmail.com, ihands@redhat.com). #include "Meter.h" + typedef enum ACPresence_ { AC_ABSENT, AC_PRESENT, diff --git a/CPUMeter.h b/CPUMeter.h index 989451a4..6dbf815d 100644 --- a/CPUMeter.h +++ b/CPUMeter.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include "Meter.h" + typedef enum { CPU_METER_NICE = 0, CPU_METER_NORMAL = 1, diff --git a/CategoriesPanel.h b/CategoriesPanel.h index 0582c642..c438e45f 100644 --- a/CategoriesPanel.h +++ b/CategoriesPanel.h @@ -13,6 +13,7 @@ in the source distribution for its full text. #include "ScreenManager.h" #include "Settings.h" + typedef struct CategoriesPanel_ { Panel super; ScreenManager* scr; diff --git a/ClockMeter.c b/ClockMeter.c index f8a447e9..79bdecd9 100644 --- a/ClockMeter.c +++ b/ClockMeter.c @@ -10,9 +10,11 @@ in the source distribution for its full text. #include "ClockMeter.h" #include +#include #include "CRT.h" #include "Object.h" +#include "ProcessList.h" static const int ClockMeter_attributes[] = { diff --git a/ClockMeter.h b/ClockMeter.h index ecd4b6a9..675df3d9 100644 --- a/ClockMeter.h +++ b/ClockMeter.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include "Meter.h" + extern const MeterClass ClockMeter_class; #endif diff --git a/ColorsPanel.c b/ColorsPanel.c index c076adc0..d9857308 100644 --- a/ColorsPanel.c +++ b/ColorsPanel.c @@ -7,17 +7,15 @@ in the source distribution for its full text. #include "ColorsPanel.h" +#include #include #include #include "CRT.h" #include "FunctionBar.h" -#include "Header.h" #include "Object.h" #include "OptionItem.h" #include "ProvideCurses.h" -#include "RichString.h" -#include "Vector.h" // TO ADD A NEW SCHEME: diff --git a/ColorsPanel.h b/ColorsPanel.h index f63ca356..54bb8580 100644 --- a/ColorsPanel.h +++ b/ColorsPanel.h @@ -11,6 +11,7 @@ in the source distribution for its full text. #include "ScreenManager.h" #include "Settings.h" + typedef struct ColorsPanel_ { Panel super; diff --git a/ColumnsPanel.h b/ColumnsPanel.h index 173e039b..8bc806eb 100644 --- a/ColumnsPanel.h +++ b/ColumnsPanel.h @@ -12,6 +12,7 @@ in the source distribution for its full text. #include "Panel.h" #include "Settings.h" + typedef struct ColumnsPanel_ { Panel super; diff --git a/CommandScreen.c b/CommandScreen.c index 12b1987d..6a87d137 100644 --- a/CommandScreen.c +++ b/CommandScreen.c @@ -2,13 +2,13 @@ #include "CommandScreen.h" +#include #include #include #include "Macros.h" #include "Panel.h" #include "ProvideCurses.h" -#include "XUtils.h" static void CommandScreen_scan(InfoScreen* this) { diff --git a/DateMeter.c b/DateMeter.c index 520e516a..d01f464d 100644 --- a/DateMeter.c +++ b/DateMeter.c @@ -10,9 +10,11 @@ in the source distribution for its full text. #include "DateMeter.h" #include +#include #include "CRT.h" #include "Object.h" +#include "ProcessList.h" static const int DateMeter_attributes[] = { diff --git a/DateMeter.h b/DateMeter.h index 63455767..a6ce47a7 100644 --- a/DateMeter.h +++ b/DateMeter.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include "Meter.h" + extern const MeterClass DateMeter_class; #endif diff --git a/DateTimeMeter.c b/DateTimeMeter.c index 588b9fbe..a042a61a 100644 --- a/DateTimeMeter.c +++ b/DateTimeMeter.c @@ -10,9 +10,11 @@ in the source distribution for its full text. #include "DateTimeMeter.h" #include +#include #include "CRT.h" #include "Object.h" +#include "ProcessList.h" static const int DateTimeMeter_attributes[] = { diff --git a/DateTimeMeter.h b/DateTimeMeter.h index 6cb73c24..04cc3273 100644 --- a/DateTimeMeter.h +++ b/DateTimeMeter.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include "Meter.h" + extern const MeterClass DateTimeMeter_class; #endif diff --git a/DiskIOMeter.c b/DiskIOMeter.c index 15ad5e54..67122a15 100644 --- a/DiskIOMeter.c +++ b/DiskIOMeter.c @@ -9,12 +9,12 @@ in the source distribution for its full text. #include #include -#include #include "CRT.h" #include "Macros.h" #include "Object.h" #include "Platform.h" +#include "ProcessList.h" #include "RichString.h" #include "XUtils.h" diff --git a/DiskIOMeter.h b/DiskIOMeter.h index 47afa5ed..68ea638a 100644 --- a/DiskIOMeter.h +++ b/DiskIOMeter.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include "Meter.h" + typedef struct DiskIOData_ { uint64_t totalBytesRead; uint64_t totalBytesWritten; diff --git a/DisplayOptionsPanel.h b/DisplayOptionsPanel.h index 02b67a08..745f125f 100644 --- a/DisplayOptionsPanel.h +++ b/DisplayOptionsPanel.h @@ -11,6 +11,7 @@ in the source distribution for its full text. #include "ScreenManager.h" #include "Settings.h" + typedef struct DisplayOptionsPanel_ { Panel super; diff --git a/EnvScreen.c b/EnvScreen.c index bd8a2b03..0fcee83a 100644 --- a/EnvScreen.c +++ b/EnvScreen.c @@ -5,7 +5,6 @@ #include #include -#include "CRT.h" #include "Macros.h" #include "Panel.h" #include "Platform.h" diff --git a/EnvScreen.h b/EnvScreen.h index 66d263fc..4d44c81c 100644 --- a/EnvScreen.h +++ b/EnvScreen.h @@ -5,6 +5,7 @@ #include "Object.h" #include "Process.h" + typedef struct EnvScreen_ { InfoScreen super; } EnvScreen; diff --git a/FunctionBar.h b/FunctionBar.h index 925e323b..1f52658e 100644 --- a/FunctionBar.h +++ b/FunctionBar.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include + typedef struct FunctionBar_ { int size; char** functions; diff --git a/Hashtable.c b/Hashtable.c index fdc87bec..f1761eeb 100644 --- a/Hashtable.c +++ b/Hashtable.c @@ -11,7 +11,6 @@ in the source distribution for its full text. #include #include -#include #include #include diff --git a/HostnameMeter.c b/HostnameMeter.c index 4968fd30..b1570c8c 100644 --- a/HostnameMeter.c +++ b/HostnameMeter.c @@ -8,12 +8,10 @@ in the source distribution for its full text. #include "config.h" // IWYU pragma: keep #include "HostnameMeter.h" -#include "Platform.h" - -#include #include "CRT.h" #include "Object.h" +#include "Platform.h" static const int HostnameMeter_attributes[] = { diff --git a/HostnameMeter.h b/HostnameMeter.h index 77fe3da9..85d94d84 100644 --- a/HostnameMeter.h +++ b/HostnameMeter.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include "Meter.h" + extern const MeterClass HostnameMeter_class; #endif diff --git a/IncSet.h b/IncSet.h index 4ff19aad..e2062c6d 100644 --- a/IncSet.h +++ b/IncSet.h @@ -14,6 +14,7 @@ in the source distribution for its full text. #include "Panel.h" #include "Vector.h" + #define INCMODE_MAX 40 typedef enum { diff --git a/InfoScreen.c b/InfoScreen.c index 4a1f6592..8f575232 100644 --- a/InfoScreen.c +++ b/InfoScreen.c @@ -4,7 +4,6 @@ #include #include -#include #include #include "CRT.h" diff --git a/ListItem.h b/ListItem.h index 87a7c073..0bbca2f4 100644 --- a/ListItem.h +++ b/ListItem.h @@ -11,6 +11,7 @@ in the source distribution for its full text. #include "Object.h" + typedef struct ListItem_ { Object super; char* value; diff --git a/LoadAverageMeter.c b/LoadAverageMeter.c index 46685f43..c91e6a2d 100644 --- a/LoadAverageMeter.c +++ b/LoadAverageMeter.c @@ -10,6 +10,7 @@ in the source distribution for its full text. #include "CRT.h" #include "Object.h" #include "Platform.h" +#include "ProcessList.h" #include "RichString.h" #include "XUtils.h" diff --git a/LoadAverageMeter.h b/LoadAverageMeter.h index 776c8bf6..d575ad53 100644 --- a/LoadAverageMeter.h +++ b/LoadAverageMeter.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include "Meter.h" + extern const MeterClass LoadAverageMeter_class; extern const MeterClass LoadMeter_class; diff --git a/MemoryMeter.c b/MemoryMeter.c index fe9ae20a..75ad7e8c 100644 --- a/MemoryMeter.c +++ b/MemoryMeter.c @@ -8,6 +8,7 @@ in the source distribution for its full text. #include "MemoryMeter.h" #include +#include #include "CRT.h" #include "Object.h" diff --git a/MemoryMeter.h b/MemoryMeter.h index d299483a..6d7dd825 100644 --- a/MemoryMeter.h +++ b/MemoryMeter.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include "Meter.h" + extern const MeterClass MemoryMeter_class; #endif diff --git a/Meter.c b/Meter.c index 13df763a..ae867e1c 100644 --- a/Meter.c +++ b/Meter.c @@ -18,7 +18,6 @@ in the source distribution for its full text. #include "CRT.h" #include "Macros.h" #include "Object.h" -#include "Platform.h" #include "ProvideCurses.h" #include "RichString.h" #include "Settings.h" diff --git a/Meter.h b/Meter.h index ff691286..cd9c9b8e 100644 --- a/Meter.h +++ b/Meter.h @@ -10,6 +10,7 @@ in the source distribution for its full text. #include "config.h" // IWYU pragma: keep #include +#include #include #include diff --git a/NetworkIOMeter.c b/NetworkIOMeter.c index 353521ad..dcba78de 100644 --- a/NetworkIOMeter.c +++ b/NetworkIOMeter.c @@ -1,13 +1,14 @@ #include "NetworkIOMeter.h" #include -#include -#include +#include #include "CRT.h" #include "Macros.h" #include "Object.h" #include "Platform.h" +#include "Process.h" +#include "ProcessList.h" #include "RichString.h" #include "XUtils.h" diff --git a/NetworkIOMeter.h b/NetworkIOMeter.h index 8178b02f..18c23ce2 100644 --- a/NetworkIOMeter.h +++ b/NetworkIOMeter.h @@ -3,6 +3,7 @@ #include "Meter.h" + typedef struct NetworkIOData_ { uint64_t bytesReceived; uint64_t packetsReceived; diff --git a/OpenFilesScreen.h b/OpenFilesScreen.h index 0fbafe0e..f3c129cc 100644 --- a/OpenFilesScreen.h +++ b/OpenFilesScreen.h @@ -13,6 +13,7 @@ in the source distribution for its full text. #include "Object.h" #include "Process.h" + typedef struct OpenFilesScreen_ { InfoScreen super; pid_t pid; diff --git a/Process.c b/Process.c index 876b3b72..01c08b88 100644 --- a/Process.c +++ b/Process.c @@ -17,6 +17,7 @@ in the source distribution for its full text. #include #include #include +#include #include #include #include @@ -31,8 +32,6 @@ in the source distribution for its full text. #if defined(MAJOR_IN_MKDEV) #include -#elif defined(MAJOR_IN_SYSMACROS) -#include #endif diff --git a/ProcessList.c b/ProcessList.c index 4d4a7ca1..8c82cbfc 100644 --- a/ProcessList.c +++ b/ProcessList.c @@ -10,7 +10,6 @@ in the source distribution for its full text. #include #include #include -#include #include "CRT.h" #include "Hashtable.h" diff --git a/ProcessList.h b/ProcessList.h index 50304f7c..32bdfa18 100644 --- a/ProcessList.h +++ b/ProcessList.h @@ -10,6 +10,8 @@ in the source distribution for its full text. #include "config.h" // IWYU pragma: keep #include +#include +#include #include #include "Hashtable.h" diff --git a/RichString.c b/RichString.c index 558c7430..ac1100f3 100644 --- a/RichString.c +++ b/RichString.c @@ -8,6 +8,7 @@ in the source distribution for its full text. #include "RichString.h" #include +#include #include #include diff --git a/SignalsPanel.h b/SignalsPanel.h index 0a90b08e..0dfe24c9 100644 --- a/SignalsPanel.h +++ b/SignalsPanel.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include "Panel.h" + typedef struct SignalItem_ { const char* name; int number; diff --git a/SwapMeter.c b/SwapMeter.c index fe10eab0..e428102a 100644 --- a/SwapMeter.c +++ b/SwapMeter.c @@ -5,8 +5,12 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include "config.h" // IWYU pragma: keep + #include "SwapMeter.h" +#include + #include "CRT.h" #include "Object.h" #include "Platform.h" diff --git a/SwapMeter.h b/SwapMeter.h index 623a0364..9c4e3122 100644 --- a/SwapMeter.h +++ b/SwapMeter.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include "Meter.h" + extern const MeterClass SwapMeter_class; #endif diff --git a/SysArchMeter.c b/SysArchMeter.c index 220ed466..64b96c9d 100644 --- a/SysArchMeter.c +++ b/SysArchMeter.c @@ -4,11 +4,16 @@ htop - SysArchMeter.c Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ + #include "config.h" // IWYU pragma: keep -#include "Platform.h" #include "SysArchMeter.h" +#include + +#include "CRT.h" +#include "Object.h" +#include "Platform.h" #include "XUtils.h" diff --git a/TasksMeter.h b/TasksMeter.h index cecb4013..4ae6ce61 100644 --- a/TasksMeter.h +++ b/TasksMeter.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include "Meter.h" + extern const MeterClass TasksMeter_class; #endif diff --git a/TraceScreen.c b/TraceScreen.c index 50c0eca1..5c7838b4 100644 --- a/TraceScreen.c +++ b/TraceScreen.c @@ -23,7 +23,6 @@ in the source distribution for its full text. #include "CRT.h" #include "FunctionBar.h" -#include "IncSet.h" #include "Panel.h" #include "ProvideCurses.h" #include "XUtils.h" diff --git a/UptimeMeter.h b/UptimeMeter.h index 49300bbb..36a5d88b 100644 --- a/UptimeMeter.h +++ b/UptimeMeter.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include "Meter.h" + extern const MeterClass UptimeMeter_class; #endif diff --git a/UsersTable.h b/UsersTable.h index 0cac7dc4..ef7d0bba 100644 --- a/UsersTable.h +++ b/UsersTable.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include "Hashtable.h" + typedef struct UsersTable_ { Hashtable* users; } UsersTable; diff --git a/generic/gettime.h b/generic/gettime.h index 87dfd746..c124d035 100644 --- a/generic/gettime.h +++ b/generic/gettime.h @@ -9,7 +9,6 @@ in the source distribution for its full text. #include #include -#include void Generic_gettime_realtime(struct timeval* tvp, uint64_t* msec); diff --git a/generic/uname.c b/generic/uname.c index 5058c418..b77bc8a9 100644 --- a/generic/uname.c +++ b/generic/uname.c @@ -6,15 +6,18 @@ in the source distribution for its full text. */ #include "config.h" // IWYU pragma: keep +#include +#include +#include + +#include "Macros.h" +#include "XUtils.h" #include "generic/uname.h" -#include #ifdef HAVE_SYS_UTSNAME_H #include #endif -#include "XUtils.h" - #ifndef OSRELEASEFILE #define OSRELEASEFILE "/etc/os-release" diff --git a/linux/HugePageMeter.c b/linux/HugePageMeter.c index 2a35c125..7f79e125 100644 --- a/linux/HugePageMeter.c +++ b/linux/HugePageMeter.c @@ -7,15 +7,19 @@ in the source distribution for its full text. #include "HugePageMeter.h" -#include "LinuxProcessList.h" - +#include #include #include +#include #include "CRT.h" +#include "LinuxProcessList.h" +#include "Macros.h" #include "Object.h" +#include "ProcessList.h" #include "RichString.h" + static const char *HugePageMeter_active_labels[4] = { NULL, NULL, NULL, NULL }; static const int HugePageMeter_attributes[] = { diff --git a/linux/HugePageMeter.h b/linux/HugePageMeter.h index 2aa4085b..e3b867d1 100644 --- a/linux/HugePageMeter.h +++ b/linux/HugePageMeter.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include "Meter.h" + extern const MeterClass HugePageMeter_class; #endif /* HEADER_HugePageMeter */ diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c index bc5b58d7..7ccdeca6 100644 --- a/linux/LinuxProcess.c +++ b/linux/LinuxProcess.c @@ -8,6 +8,7 @@ in the source distribution for its full text. #include "LinuxProcess.h" +#include #include #include #include diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c index 7a118d77..62bd792e 100644 --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -20,6 +20,7 @@ in the source distribution for its full text. #include #include #include +#include #include #include #include diff --git a/linux/Platform.c b/linux/Platform.c index af3fa277..0be82fc3 100644 --- a/linux/Platform.c +++ b/linux/Platform.c @@ -12,7 +12,6 @@ in the source distribution for its full text. #include #include #include -#include #include #include #include @@ -63,6 +62,7 @@ in the source distribution for its full text. #include "zfs/ZfsCompressedArcMeter.h" #ifdef HAVE_LIBCAP +#include #include #endif diff --git a/linux/Platform.h b/linux/Platform.h index 2506fae5..ff7e954b 100644 --- a/linux/Platform.h +++ b/linux/Platform.h @@ -9,6 +9,9 @@ in the source distribution for its full text. #include #include +#include +#include +#include #include #include "Action.h" diff --git a/linux/PressureStallMeter.h b/linux/PressureStallMeter.h index 1a0ad584..7317b350 100644 --- a/linux/PressureStallMeter.h +++ b/linux/PressureStallMeter.h @@ -12,6 +12,7 @@ in the source distribution for its full text. #include "Meter.h" + extern const MeterClass PressureStallCPUSomeMeter_class; extern const MeterClass PressureStallIOSomeMeter_class; diff --git a/linux/SELinuxMeter.c b/linux/SELinuxMeter.c index 3f79e462..374fa5e9 100644 --- a/linux/SELinuxMeter.c +++ b/linux/SELinuxMeter.c @@ -10,12 +10,12 @@ in the source distribution for its full text. #include "CRT.h" #include +#include #include #include #include #include -#include "Macros.h" #include "Object.h" #include "XUtils.h" diff --git a/linux/SELinuxMeter.h b/linux/SELinuxMeter.h index d79ad017..453940c0 100644 --- a/linux/SELinuxMeter.h +++ b/linux/SELinuxMeter.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include "Meter.h" + extern const MeterClass SELinuxMeter_class; #endif /* HEADER_SELinuxMeter */ diff --git a/linux/SystemdMeter.c b/linux/SystemdMeter.c index 47b86563..36ad40a9 100644 --- a/linux/SystemdMeter.c +++ b/linux/SystemdMeter.c @@ -19,6 +19,7 @@ in the source distribution for its full text. #include "Macros.h" #include "Object.h" #include "RichString.h" +#include "Settings.h" #include "XUtils.h" #if defined(BUILD_STATIC) && defined(HAVE_LIBSYSTEMD) diff --git a/linux/SystemdMeter.h b/linux/SystemdMeter.h index 0f226d65..98ce6f76 100644 --- a/linux/SystemdMeter.h +++ b/linux/SystemdMeter.h @@ -10,6 +10,7 @@ in the source distribution for its full text. #include "Meter.h" + extern const MeterClass SystemdMeter_class; #endif /* HEADER_SystemdMeter */ diff --git a/linux/ZramMeter.c b/linux/ZramMeter.c index e91a499b..4cfd1f79 100644 --- a/linux/ZramMeter.c +++ b/linux/ZramMeter.c @@ -1,5 +1,7 @@ #include "ZramMeter.h" +#include + #include "CRT.h" #include "Meter.h" #include "Object.h" diff --git a/linux/ZramMeter.h b/linux/ZramMeter.h index 7cf7861e..ddba1bae 100644 --- a/linux/ZramMeter.h +++ b/linux/ZramMeter.h @@ -3,6 +3,7 @@ #include "Meter.h" + extern const MeterClass ZramMeter_class; #endif diff --git a/solaris/SolarisProcessList.c b/solaris/SolarisProcessList.c index 5223addf..5e160540 100644 --- a/solaris/SolarisProcessList.c +++ b/solaris/SolarisProcessList.c @@ -24,6 +24,7 @@ in the source distribution for its full text. #include "CRT.h" + #define MAXCMDLINE 255 static int pageSize; diff --git a/unsupported/UnsupportedProcess.h b/unsupported/UnsupportedProcess.h index 2e104494..f39a3fbc 100644 --- a/unsupported/UnsupportedProcess.h +++ b/unsupported/UnsupportedProcess.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include "Settings.h" + typedef struct UnsupportedProcess_ { Process super; diff --git a/zfs/ZfsArcMeter.c b/zfs/ZfsArcMeter.c index 766ff39e..47812e02 100644 --- a/zfs/ZfsArcMeter.c +++ b/zfs/ZfsArcMeter.c @@ -8,6 +8,8 @@ in the source distribution for its full text. #include "ZfsArcMeter.h" #include "ZfsArcStats.h" +#include + #include "CRT.h" #include "Object.h" #include "Platform.h" diff --git a/zfs/ZfsArcMeter.h b/zfs/ZfsArcMeter.h index 52bf7842..d258986d 100644 --- a/zfs/ZfsArcMeter.h +++ b/zfs/ZfsArcMeter.h @@ -11,6 +11,7 @@ in the source distribution for its full text. #include "Meter.h" + void ZfsArcMeter_readStats(Meter* this, const ZfsArcStats* stats); extern const MeterClass ZfsArcMeter_class; diff --git a/zfs/ZfsCompressedArcMeter.c b/zfs/ZfsCompressedArcMeter.c index 201bf410..5f9511c1 100644 --- a/zfs/ZfsCompressedArcMeter.c +++ b/zfs/ZfsCompressedArcMeter.c @@ -7,13 +7,14 @@ in the source distribution for its full text. #include "ZfsCompressedArcMeter.h" +#include + #include "CRT.h" #include "Meter.h" #include "Object.h" #include "Platform.h" #include "RichString.h" #include "XUtils.h" - #include "zfs/ZfsArcStats.h" diff --git a/zfs/ZfsCompressedArcMeter.h b/zfs/ZfsCompressedArcMeter.h index 025a9dd8..edfc5cb4 100644 --- a/zfs/ZfsCompressedArcMeter.h +++ b/zfs/ZfsCompressedArcMeter.h @@ -11,6 +11,7 @@ in the source distribution for its full text. #include "Meter.h" + void ZfsCompressedArcMeter_readStats(Meter* this, const ZfsArcStats* stats); extern const MeterClass ZfsCompressedArcMeter_class;