From a94b2ec5a1159dc49c12a7697ad9e3bd92b6aeaf Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Sun, 13 Dec 2009 03:47:26 +0100 Subject: [PATCH] simplify this conditional a bit --- src/core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/core.c b/src/core.c index d221786..e1083fe 100644 --- a/src/core.c +++ b/src/core.c @@ -153,14 +153,12 @@ struct text_object *construct_text_object(const char *s, const char *arg, long obj->data.l = get_x11_color(s); } else #endif /* X11 */ -#ifdef __OpenBSD__ - OBJ(freq, 0) -#else +#ifndef __OpenBSD__ OBJ(acpitemp, 0) obj->data.i = open_acpi_temperature(arg); END OBJ(acpiacadapter, 0) - END OBJ(freq, 0) #endif /* !__OpenBSD__ */ + END OBJ(freq, 0) get_cpu_count(); if (!arg || !isdigit(arg[0]) || strlen(arg) >= 2 || atoi(&arg[0]) == 0 || atoi(&arg[0]) > info.cpu_count) { -- 1.7.9.5