Commit a92f8039 authored by Hisham Muhammad's avatar Hisham Muhammad
Browse files

Merge pull request #268 from jweyrich/darwin-fixes

Darwin fixes - duplicate & conflicting decls
parents 229d0058 e52c070e
...@@ -158,8 +158,6 @@ typedef struct ProcessClass_ { ...@@ -158,8 +158,6 @@ typedef struct ProcessClass_ {
#define ONE_DECIMAL_M (ONE_DECIMAL_K * ONE_DECIMAL_K) #define ONE_DECIMAL_M (ONE_DECIMAL_K * ONE_DECIMAL_K)
#define ONE_DECIMAL_G (ONE_DECIMAL_M * ONE_DECIMAL_K) #define ONE_DECIMAL_G (ONE_DECIMAL_M * ONE_DECIMAL_K)
extern char Process_pidFormat[20];
void Process_setupColumnWidths(); void Process_setupColumnWidths();
void Process_humanNumber(RichString* str, unsigned long number, bool coloring); void Process_humanNumber(RichString* str, unsigned long number, bool coloring);
......
...@@ -81,7 +81,6 @@ void Platform_setBindings(Htop_Action* keys) { ...@@ -81,7 +81,6 @@ void Platform_setBindings(Htop_Action* keys) {
} }
int Platform_numberOfFields = 100; int Platform_numberOfFields = 100;
char* Process_pidFormat = "%7u ";
int Platform_getUptime() { int Platform_getUptime() {
struct timeval bootTime, currTime; struct timeval bootTime, currTime;
......
...@@ -23,7 +23,6 @@ extern MeterClass* Platform_meterTypes[]; ...@@ -23,7 +23,6 @@ extern MeterClass* Platform_meterTypes[];
void Platform_setBindings(Htop_Action* keys); void Platform_setBindings(Htop_Action* keys);
extern int Platform_numberOfFields; extern int Platform_numberOfFields;
extern char* Process_pidFormat;
int Platform_getUptime(); int Platform_getUptime();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment