From ffacac14a91a7fb9ec6409bbc7b1f13b4ccf67fd Mon Sep 17 00:00:00 2001 From: Jardel Weyrich Date: Thu, 10 Sep 2015 10:45:22 -0300 Subject: [PATCH 1/2] Remove duplicate declaration. --- Process.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/Process.h b/Process.h index d856c035..841b1291 100644 --- a/Process.h +++ b/Process.h @@ -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); From e52c070ef5d0ce607acb7506e2527c4747c8a439 Mon Sep 17 00:00:00 2001 From: Jardel Weyrich Date: Thu, 10 Sep 2015 10:46:44 -0300 Subject: [PATCH 2/2] Remove conflicting declarations. --- darwin/Platform.c | 1 - darwin/Platform.h | 1 - 2 files changed, 2 deletions(-) diff --git a/darwin/Platform.c b/darwin/Platform.c index 2c8ed2cf..c672df0a 100644 --- a/darwin/Platform.c +++ b/darwin/Platform.c @@ -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; diff --git a/darwin/Platform.h b/darwin/Platform.h index f670c7f6..6b3e3d2d 100644 --- a/darwin/Platform.h +++ b/darwin/Platform.h @@ -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();