mirror of https://github.com/xzeldon/htop.git
Fix include file ordering of generic headers
This commit is contained in:
parent
61ef1134d9
commit
adaf748ab6
|
@ -20,9 +20,9 @@ in the source distribution for its full text.
|
|||
|
||||
#include "CRT.h"
|
||||
#include "DarwinProcess.h"
|
||||
#include "generic/openzfs_sysctl.h"
|
||||
#include "Platform.h"
|
||||
#include "ProcessList.h"
|
||||
#include "generic/openzfs_sysctl.h"
|
||||
#include "zfs/ZfsArcStats.h"
|
||||
|
||||
|
||||
|
|
|
@ -16,11 +16,11 @@ in the source distribution for its full text.
|
|||
#include "CPUMeter.h"
|
||||
#include "DarwinProcess.h"
|
||||
#include "DiskIOMeter.h"
|
||||
#include "generic/hostname.h"
|
||||
#include "generic/uname.h"
|
||||
#include "NetworkIOMeter.h"
|
||||
#include "ProcessLocksScreen.h"
|
||||
#include "SignalsPanel.h"
|
||||
#include "generic/hostname.h"
|
||||
#include "generic/uname.h"
|
||||
|
||||
|
||||
extern const ProcessField Platform_defaultFields[];
|
||||
|
|
|
@ -14,11 +14,11 @@ in the source distribution for its full text.
|
|||
#include "Action.h"
|
||||
#include "BatteryMeter.h"
|
||||
#include "DiskIOMeter.h"
|
||||
#include "generic/hostname.h"
|
||||
#include "generic/uname.h"
|
||||
#include "NetworkIOMeter.h"
|
||||
#include "ProcessLocksScreen.h"
|
||||
#include "SignalsPanel.h"
|
||||
#include "generic/hostname.h"
|
||||
#include "generic/uname.h"
|
||||
|
||||
|
||||
extern const ProcessField Platform_defaultFields[];
|
||||
|
|
|
@ -30,13 +30,13 @@ in the source distribution for its full text.
|
|||
#include "CRT.h"
|
||||
#include "Compat.h"
|
||||
#include "FreeBSDProcess.h"
|
||||
#include "generic/openzfs_sysctl.h"
|
||||
#include "Macros.h"
|
||||
#include "Object.h"
|
||||
#include "Process.h"
|
||||
#include "ProcessList.h"
|
||||
#include "Settings.h"
|
||||
#include "XUtils.h"
|
||||
#include "generic/openzfs_sysctl.h"
|
||||
#include "zfs/ZfsArcStats.h"
|
||||
|
||||
|
||||
|
|
|
@ -13,13 +13,13 @@ in the source distribution for its full text.
|
|||
#include "Action.h"
|
||||
#include "BatteryMeter.h"
|
||||
#include "DiskIOMeter.h"
|
||||
#include "generic/hostname.h"
|
||||
#include "generic/uname.h"
|
||||
#include "Meter.h"
|
||||
#include "NetworkIOMeter.h"
|
||||
#include "Process.h"
|
||||
#include "ProcessLocksScreen.h"
|
||||
#include "SignalsPanel.h"
|
||||
#include "generic/hostname.h"
|
||||
#include "generic/uname.h"
|
||||
|
||||
|
||||
extern const ProcessField Platform_defaultFields[];
|
||||
|
|
|
@ -9,6 +9,7 @@ in the source distribution for its full text.
|
|||
|
||||
#include <stddef.h>
|
||||
|
||||
|
||||
void Generic_hostname(char* buffer, size_t size);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -9,6 +9,7 @@ in the source distribution for its full text.
|
|||
|
||||
#include "zfs/ZfsArcStats.h"
|
||||
|
||||
|
||||
void openzfs_sysctl_init(ZfsArcStats* stats);
|
||||
|
||||
void openzfs_sysctl_updateArcStats(ZfsArcStats* stats);
|
||||
|
|
|
@ -65,14 +65,15 @@ static void parseOSRelease(char* buffer, size_t bufferLen) {
|
|||
char* Generic_uname(void) {
|
||||
static char savedString[
|
||||
/* uname structure fields - manpages recommend sizeof */
|
||||
sizeof(uname_info.sysname) +
|
||||
sizeof(uname_info.release) +
|
||||
sizeof(uname_info.machine) +
|
||||
sizeof(((struct utsname*)0)->sysname) +
|
||||
sizeof(((struct utsname*)0)->release) +
|
||||
sizeof(((struct utsname*)0)->machine) +
|
||||
16/*markup*/ +
|
||||
128/*distro*/] = {'\0'};
|
||||
static bool loaded_data = false;
|
||||
|
||||
if (!loaded_data) {
|
||||
struct utsname uname_info;
|
||||
int uname_result = uname(&uname_info);
|
||||
|
||||
char distro[128];
|
||||
|
|
|
@ -14,13 +14,13 @@ in the source distribution for its full text.
|
|||
#include "Action.h"
|
||||
#include "BatteryMeter.h"
|
||||
#include "DiskIOMeter.h"
|
||||
#include "generic/hostname.h"
|
||||
#include "generic/uname.h"
|
||||
#include "Meter.h"
|
||||
#include "NetworkIOMeter.h"
|
||||
#include "Process.h"
|
||||
#include "ProcessLocksScreen.h"
|
||||
#include "SignalsPanel.h"
|
||||
#include "generic/hostname.h"
|
||||
#include "generic/uname.h"
|
||||
|
||||
/* GNU/Hurd does not have PATH_MAX in limits.h */
|
||||
#ifndef PATH_MAX
|
||||
|
|
|
@ -14,13 +14,13 @@ in the source distribution for its full text.
|
|||
#include "Action.h"
|
||||
#include "BatteryMeter.h"
|
||||
#include "DiskIOMeter.h"
|
||||
#include "generic/hostname.h"
|
||||
#include "generic/uname.h"
|
||||
#include "Meter.h"
|
||||
#include "NetworkIOMeter.h"
|
||||
#include "Process.h"
|
||||
#include "ProcessLocksScreen.h"
|
||||
#include "SignalsPanel.h"
|
||||
#include "generic/hostname.h"
|
||||
#include "generic/uname.h"
|
||||
|
||||
|
||||
extern const ProcessField Platform_defaultFields[];
|
||||
|
|
|
@ -19,11 +19,11 @@ in the source distribution for its full text.
|
|||
#include "Action.h"
|
||||
#include "BatteryMeter.h"
|
||||
#include "DiskIOMeter.h"
|
||||
#include "generic/hostname.h"
|
||||
#include "generic/uname.h"
|
||||
#include "NetworkIOMeter.h"
|
||||
#include "ProcessLocksScreen.h"
|
||||
#include "SignalsPanel.h"
|
||||
#include "generic/hostname.h"
|
||||
#include "generic/uname.h"
|
||||
|
||||
|
||||
#define kill(pid, signal) kill(pid / 1024, signal)
|
||||
|
|
Loading…
Reference in New Issue