From: Michael Stapelberg <stapelberg@users.noreply.github.com>
Date: Thu, 2 Apr 2015 20:42:47 +0000 (-0700)
Subject: Merge pull request #17 from chrko/format_down
X-Git-Tag: 2.10~38
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3status;a=commitdiff_plain;h=d00a0e087c79475e199ff33a33a3e73fcd2c0a22;hp=5c094a54932edebf6e44c4a7119fa510ddf7ae7a

Merge pull request #17 from chrko/format_down

Adding format_down option to path_exists and run_watch
---

diff --git a/man/i3status.man b/man/i3status.man
index 6309c2a..5754196 100644
--- a/man/i3status.man
+++ b/man/i3status.man
@@ -437,6 +437,7 @@ query +/dev/mixer+ directly if +mixer_dix+ is -1, otherwise
 *Example order*: +volume master+
 
 *Example format*: +♪: %volume+
+
 *Example format_muted*: +♪: 0%%+
 
 *Example configuration*:
diff --git a/src/print_cpu_usage.c b/src/print_cpu_usage.c
index 2c59f69..927e763 100644
--- a/src/print_cpu_usage.c
+++ b/src/print_cpu_usage.c
@@ -10,8 +10,12 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
+#if defined(__OpenBSD__)
+#include <sys/sched.h>
+#else
 #include <sys/dkstat.h>
 #endif
+#endif
 
 #if defined(__DragonFly__)
 #include <sys/param.h>