diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2015-03-15 22:53:10 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2015-03-15 22:53:10 -0300 |
| commit | d2acffa59abba396b710f71436823c54bfcf2f7e (patch) | |
| tree | 495599681c0cfd4288ade3f4b9482434a1988a6b /unsupported | |
| parent | c29e53c5d5aa9b9a5e13ea5ee74bb0fd13fc7f93 (diff) | |
| parent | 50000d808e23a80b8e3ec26b46062c419edff6d4 (diff) | |
Merge branch 'wip' of https://github.com/hishamhm/htop into freebsd
Conflicts:
htop.c
unsupported/Platform.h
Diffstat (limited to 'unsupported')
| -rw-r--r-- | unsupported/Platform.c | 6 | ||||
| -rw-r--r-- | unsupported/Platform.h | 4 |
2 files changed, 5 insertions, 5 deletions
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 2476d601..64261f7a 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); @@ -19,4 +21,6 @@ int Platform_getUptime(); void Platform_getLoadAverage(double* one, double* five, double* fifteen); +int Platform_getMaxPid(); + #endif |