projects
/
monky
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
169dbe4
)
simplify this conditional a bit
author
Phil Sutter
<phil@nwl.cc>
Sun, 13 Dec 2009 02:47:26 +0000
(
03:47
+0100)
committer
Phil Sutter
<phil@nwl.cc>
Sun, 13 Dec 2009 02:47:26 +0000
(
03:47
+0100)
src/core.c
patch
|
blob
|
history
diff --git
a/src/core.c
b/src/core.c
index
d221786
..
e1083fe
100644
(file)
--- 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 */
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)
OBJ(acpitemp, 0)
obj->data.i = open_acpi_temperature(arg);
END OBJ(acpiacadapter, 0)
- END OBJ(freq, 0)
#endif /* !__OpenBSD__ */
#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) {
get_cpu_count();
if (!arg || !isdigit(arg[0]) || strlen(arg) >= 2 || atoi(&arg[0]) == 0
|| atoi(&arg[0]) > info.cpu_count) {