mirror of https://github.com/xzeldon/htop.git
Merge branch 'illumos-compile-fix' of BenBE/htop
This commit is contained in:
commit
f16aa483dd
|
@ -7,7 +7,19 @@ Released under the GNU GPLv2, see the COPYING file
|
||||||
in the source distribution for its full text.
|
in the source distribution for its full text.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "Platform.h"
|
#include "solaris/Platform.h"
|
||||||
|
|
||||||
|
#include <kstat.h>
|
||||||
|
#include <math.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <time.h>
|
||||||
|
#include <utmpx.h>
|
||||||
|
#include <sys/loadavg.h>
|
||||||
|
#include <sys/resource.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/time.h>
|
||||||
|
#include <sys/var.h>
|
||||||
|
|
||||||
#include "Macros.h"
|
#include "Macros.h"
|
||||||
#include "Meter.h"
|
#include "Meter.h"
|
||||||
#include "CPUMeter.h"
|
#include "CPUMeter.h"
|
||||||
|
@ -26,17 +38,6 @@ in the source distribution for its full text.
|
||||||
#include "SolarisProcess.h"
|
#include "SolarisProcess.h"
|
||||||
#include "SolarisProcessList.h"
|
#include "SolarisProcessList.h"
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/time.h>
|
|
||||||
#include <sys/resource.h>
|
|
||||||
#include <utmpx.h>
|
|
||||||
#include <sys/loadavg.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <kstat.h>
|
|
||||||
#include <time.h>
|
|
||||||
#include <math.h>
|
|
||||||
#include <sys/var.h>
|
|
||||||
|
|
||||||
|
|
||||||
double plat_loadavg[3] = {0};
|
double plat_loadavg[3] = {0};
|
||||||
|
|
||||||
|
|
|
@ -9,9 +9,12 @@ Released under the GNU GPLv2, see the COPYING file
|
||||||
in the source distribution for its full text.
|
in the source distribution for its full text.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "config.h" // IWYU pragma: keep
|
||||||
|
|
||||||
#include <libproc.h>
|
#include <libproc.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
#include <sys/mkdev.h>
|
#include <sys/mkdev.h>
|
||||||
#include <sys/proc.h>
|
#include <sys/proc.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
@ -22,6 +25,7 @@ in the source distribution for its full text.
|
||||||
#include "NetworkIOMeter.h"
|
#include "NetworkIOMeter.h"
|
||||||
#include "ProcessLocksScreen.h"
|
#include "ProcessLocksScreen.h"
|
||||||
#include "SignalsPanel.h"
|
#include "SignalsPanel.h"
|
||||||
|
|
||||||
#include "generic/hostname.h"
|
#include "generic/hostname.h"
|
||||||
#include "generic/uname.h"
|
#include "generic/uname.h"
|
||||||
|
|
||||||
|
|
|
@ -6,17 +6,19 @@ Released under the GNU GPLv2, see the COPYING file
|
||||||
in the source distribution for its full text.
|
in the source distribution for its full text.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "Process.h"
|
#include "solaris/SolarisProcess.h"
|
||||||
#include "ProcessList.h"
|
|
||||||
#include "SolarisProcess.h"
|
|
||||||
#include "Platform.h"
|
|
||||||
#include "CRT.h"
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/syscall.h>
|
#include <sys/syscall.h>
|
||||||
|
|
||||||
|
#include "Process.h"
|
||||||
|
#include "ProcessList.h"
|
||||||
|
#include "CRT.h"
|
||||||
|
|
||||||
|
#include "solaris/Platform.h"
|
||||||
|
|
||||||
|
|
||||||
const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
|
const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
|
||||||
[0] = { .name = "", .title = NULL, .description = NULL, .flags = 0, },
|
[0] = { .name = "", .title = NULL, .description = NULL, .flags = 0, },
|
||||||
|
|
|
@ -8,11 +8,15 @@ Released under the GNU GPLv2, see the COPYING file
|
||||||
in the source distribution for its full text.
|
in the source distribution for its full text.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "Settings.h"
|
#include "config.h" // IWYU pragma: keep
|
||||||
|
|
||||||
#include <zone.h>
|
#include <zone.h>
|
||||||
#include <sys/proc.h>
|
#include <sys/proc.h>
|
||||||
#include <libproc.h>
|
#include <libproc.h>
|
||||||
|
|
||||||
|
#include "Settings.h"
|
||||||
|
|
||||||
|
|
||||||
typedef struct SolarisProcess_ {
|
typedef struct SolarisProcess_ {
|
||||||
Process super;
|
Process super;
|
||||||
int kernel;
|
int kernel;
|
||||||
|
|
Loading…
Reference in New Issue