From 5ca9b8e00266a4a3513143b91b87a616caee8f1c Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Mon, 23 Feb 2015 00:59:24 -0300 Subject: [PATCH] Work on fixing build of "unsupported" platform --- Makefile.am | 10 ++++++---- unsupported/Platform.c | 6 +----- unsupported/Platform.h | 7 +++++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 844e1b32..0f8baaa5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,11 +42,13 @@ linux/LinuxProcess.h linux/LinuxProcessList.h linux/LinuxCRT.h linux/Battery.h endif if HTOP_UNSUPPORTED -myhtopplatsources = unsupported/Platform.c unsupported/UnsupportedProcessList.c \ -unsupported/UnsupportedCRT.c +myhtopplatsources = unsupported/Platform.c \ +unsupported/UnsupportedProcess.c unsupported/UnsupportedProcessList.c \ +unsupported/UnsupportedCRT.c unsupported/Battery.c -myhtopplatheaders = unsupported/Platform.h unsupported/UnsupportedProcessList.h \ -unsupported/UnsupportedCRT.h +myhtopplatheaders = unsupported/Platform.h \ +unsupported/UnsupportedProcess.h unsupported/UnsupportedProcessList.h \ +unsupported/UnsupportedCRT.h unsupported/Battery.h endif SUFFIXES = .h diff --git a/unsupported/Platform.c b/unsupported/Platform.c index d8618919..e5f22d2c 100644 --- a/unsupported/Platform.c +++ b/unsupported/Platform.c @@ -18,6 +18,7 @@ in the source distribution for its full text. /*{ #include "Action.h" #include "BatteryMeter.h" +#include "UnsupportedProcess.h" }*/ void Platform_setBindings(Htop_Action* keys) { @@ -59,8 +60,3 @@ int Platform_getMaxPid() { return -1; } -void Platform_getBatteryLevel(double* level, ACPresence* isOnAC) { - *level = -1; - *isOnAC = AC_ERROR; -} - diff --git a/unsupported/Platform.h b/unsupported/Platform.h index 026c45fb..888e8cf3 100644 --- a/unsupported/Platform.h +++ b/unsupported/Platform.h @@ -10,6 +10,8 @@ in the source distribution for its full text. */ #include "Action.h" +#include "BatteryMeter.h" +#include "UnsupportedProcess.h" void Platform_setBindings(Htop_Action* keys); @@ -17,4 +19,9 @@ extern MeterClass* Platform_meterTypes[]; int Platform_getUptime(); +void Platform_getLoadAverage(double* one, double* five, double* fifteen); + +int Platform_getMaxPid(); + + #endif