zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #268 from jweyrich/darwin-fixes 

Darwin fixes - duplicate & conflicting decls
This commit is contained in:
Hisham Muhammad 2015-09-10 16:41:53 -03:00
parent 229d005851 e52c070ef5
commit a92f803903
3 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Process.h
View File

@ -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);

1
darwin/Platform.c
View File

@ -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;

1
darwin/Platform.h
View File

@ -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();