From c96f5b11432c7194865f31589b2a770006d2ac7b Mon Sep 17 00:00:00 2001 From: Kevin Lyles Date: Wed, 20 Feb 2008 10:01:13 +0000 Subject: [PATCH] Removed unused macros and removed X11 options from the options string unless X11 is enabled git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1004 7f574dfc-610e-0410-a909-a81674777703 --- src/conky.c | 4 ++-- src/conky.h | 1 - src/top.c | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/conky.c b/src/conky.c index d006f10..827958f 100644 --- a/src/conky.c +++ b/src/conky.c @@ -7745,8 +7745,8 @@ else if (strcasecmp(name, a) == 0 || strcasecmp(name, b) == 0) } - /* : means that character before that takes an argument */ -static const char *getopt_string = "vVdt:f:u:i:hc:w:x:y:a:" +/* : means that character before that takes an argument */ +static const char *getopt_string = "vVdt:u:i:hc:" #ifdef X11 "x:y:w:a:f:" #ifdef OWN_WINDOW diff --git a/src/conky.h b/src/conky.h index 5503dff..96db823 100644 --- a/src/conky.h +++ b/src/conky.h @@ -490,7 +490,6 @@ void update_stuff(); int round_to_int(float f); -#define SET_NEED(a) need_mask |= 1 << (a) extern unsigned long long need_mask; extern double current_update_time, last_update_time; diff --git a/src/top.c b/src/top.c index 3175471..3a5f107 100644 --- a/src/top.c +++ b/src/top.c @@ -528,9 +528,6 @@ void sp_acopy(struct sorted_process *sp_head, struct process ** ar, int max_size } } -// stole from common.c -#define NEED(a) ((need_mask & (1 << a)) && ((info.mask & (1 << a)) == 0)) - /* ****************************************************************** */ /* Get a sorted list of the top cpu hogs and top mem hogs. */ /* Results are stored in the cpu,mem arrays in decreasing order[0-9]. */ -- 1.7.9.5