mirror of
https://github.com/xzeldon/htop.git
synced 2024-12-24 15:15:44 +00:00
Merge pull request #268 from jweyrich/darwin-fixes
Darwin fixes - duplicate & conflicting decls
This commit is contained in:
commit
a92f803903
@ -158,8 +158,6 @@ typedef struct ProcessClass_ {
|
||||
#define ONE_DECIMAL_M (ONE_DECIMAL_K * ONE_DECIMAL_K)
|
||||
#define ONE_DECIMAL_G (ONE_DECIMAL_M * ONE_DECIMAL_K)
|
||||
|
||||
extern char Process_pidFormat[20];
|
||||
|
||||
void Process_setupColumnWidths();
|
||||
|
||||
void Process_humanNumber(RichString* str, unsigned long number, bool coloring);
|
||||
|
@ -81,7 +81,6 @@ void Platform_setBindings(Htop_Action* keys) {
|
||||
}
|
||||
|
||||
int Platform_numberOfFields = 100;
|
||||
char* Process_pidFormat = "%7u ";
|
||||
|
||||
int Platform_getUptime() {
|
||||
struct timeval bootTime, currTime;
|
||||
|
@ -23,7 +23,6 @@ extern MeterClass* Platform_meterTypes[];
|
||||
void Platform_setBindings(Htop_Action* keys);
|
||||
|
||||
extern int Platform_numberOfFields;
|
||||
extern char* Process_pidFormat;
|
||||
|
||||
int Platform_getUptime();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user