Small improvement regarding readability if one hasn't an IPv6 address.

[i3/i3status] / i3status.h

diff --git a/i3status.h b/i3status.h
index 0eb9ce1293d5646cb60fcfe1b4f903039b5a28bf..aa7f20e39a1953da7ba8ba2544584c436ea36591 100644 (file)
--- a/i3status.h
+++ b/i3status.h
@@ -5,7 +5,11 @@
 
 #include "queue.h"
 
-#define BAR "^fg(#333333)^p(5;-2)^ro(2)^p()^fg()^p(5)"
+#ifdef DZEN
+       #define BAR "^fg(#333333)^p(5;-2)^ro(2)^p()^fg()^p(5)"
+#elif XMOBAR
+       #define BAR "<fc=#333333> | </fc>"
+#endif
 #define BEGINS_WITH(haystack, needle) (strncmp(haystack, needle, strlen(needle)) == 0)
 #define max(a, b) (a > b ? a : b)
 
@@ -24,7 +28,7 @@
 
 #define THERMAL_ZONE "/sys/class/thermal/thermal_zone%d/temp"
 
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 
 #define THERMAL_ZONE "hw.acpi.thermal.tz%d.temperature"
 #define BATT_LIFE "hw.acpi.battery.life"
@@ -33,6 +37,13 @@
 
 #endif
 
+#if defined(__FreeBSD_kernel__) && defined(__GLIBC__)
+
+#include <sys/stat.h>
+#include <sys/param.h>
+
+#endif
+
 typedef enum { CS_DISCHARGING, CS_CHARGING, CS_FULL } charging_status_t;
 enum { ORDER_RUN, ORDER_WLAN, ORDER_ETH, ORDER_BATTERY, ORDER_CPU_TEMPERATURE, ORDER_LOAD, ORDER_TIME, ORDER_IPV6, MAX_ORDER };
 
@@ -55,6 +66,7 @@ bool slurp(char *filename, char *destination, int size);
 /* src/output.c */
 void write_error_to_statusbar(const char *message);
 char *color(const char *colorstr);
+char *endcolor() __attribute__ ((pure));
 void cleanup_rbar_dir();
 
 /* src/config.c */
@@ -79,7 +91,7 @@ extern int highest_order;
 
 extern const char *wlan_interface;
 extern const char *eth_interface;
-extern const char *wmii_path;
+extern char *wmii_path;
 extern const char *time_format;
 extern bool use_colors;
 extern bool get_ethspeed;