From 86417e415743ab2ba8feaa83ba303039ea10a012 Mon Sep 17 00:00:00 2001 From: "Martin \"eto\" Misuth" Date: Tue, 6 Oct 2015 12:46:37 +0200 Subject: [PATCH] Unless I move signal definitions into the comment used for header generation, htop fails to compile with: ```text SignalsPanel.c:32:49: error: use of undeclared identifier 'Platform_signals' Panel_set(this, i, (Object*) ListItem_new(Platform_signals[i].name, Platform_signals[i].number)); ^ 1 error generated. *** Error code 1 ``` --- freebsd/Platform.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/freebsd/Platform.c b/freebsd/Platform.c index 0d01b0c..64e5e95 100644 --- a/freebsd/Platform.c +++ b/freebsd/Platform.c @@ -31,12 +31,6 @@ in the source distribution for its full text. extern ProcessFieldData Process_fields[]; -}*/ - -ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 }; - -int Platform_numberOfFields = LAST_PROCESSFIELD; - static SignalItem Platform_signals[] = { { .name = " 0 Cancel", .number = 0 }, { .name = " 1 SIGHUP", .number = 1 }, @@ -74,6 +68,12 @@ static SignalItem Platform_signals[] = { { .name = "33 SIGLIBRT", .number = 33 }, }; +}*/ + +ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 }; + +int Platform_numberOfFields = LAST_PROCESSFIELD; + unsigned int Platform_numberOfSignals = sizeof(Platform_signals)/sizeof(SignalItem); void Platform_setBindings(Htop_Action* keys) { @@ -105,7 +105,7 @@ int Platform_getUptime() { struct timeval bootTime, currTime; int mib[2] = { CTL_KERN, KERN_BOOTTIME }; size_t size = sizeof(bootTime); - + int err = sysctl(mib, 2, &bootTime, &size, NULL, 0); if (err) { return -1; @@ -119,7 +119,7 @@ void Platform_getLoadAverage(double* one, double* five, double* fifteen) { struct loadavg loadAverage; int mib[2] = { CTL_VM, VM_LOADAVG }; size_t size = sizeof(loadAverage); - + int err = sysctl(mib, 2, &loadAverage, &size, NULL, 0); if (err) { *one = 0; -- GitLab