Fix FTBFS on kFreeBSD

diff --git a/debian/changelog b/debian/changelog
index bae6ed99dc15c3b456c2c2f41312867d7b203ece..4acb4704019ff5ef8324320ce225328a30fef23f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 i3status (2.3-1) unstable; urgency=low
 
+  [ Michael Stapelberg ]
   * config search order is now ~/.i3status.conf, ~/.config/i3status/config,
     /etc/i3status/config, then /etc/xdg/i3status/config
   * battery: use POWER_NOW if CURRENT_NOW is not available (linux >= 2.6.36)
@@ -12,7 +13,10 @@ i3status (2.3-1) unstable; urgency=low
   * Bugfix: respect locale settings (for %c in date format)
   * debian: use [linux-any] in dependencies (Closes: #634491)
 
- -- Michael Stapelberg <michael@stapelberg.de>  Tue, 19 Jul 2011 15:35:30 +0200
+  [ Axel Beckert ]
+  * Fix FTBFS on kfreebsd.
+
+ -- Michael Stapelberg <michael@stapelberg.de>  Thu, 21 Jul 2011 21:22:54 +0200
 
 i3status (2.2-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index af0032322e39b3aaab88ecb6e40549201178f99c..4ca214cf63109729f6420f1d6092762036662cf1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: extra
 Maintainer: Michael Stapelberg <michael@stapelberg.de>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 5), libiw-dev [linux-any], libconfuse-dev, asciidoc, xmlto, libcap2-bin, libasound2-dev
+Build-Depends: debhelper (>= 5), libiw-dev [linux-any], libconfuse-dev, asciidoc, xmlto, libcap2-bin [linux-any], libasound2-dev [linux-any]
 Standards-Version: 3.9.2
 Homepage: http://i3wm.org/i3status
 

diff --git a/src/print_volume.c b/src/print_volume.c
index 0eca0c0a2bbae34d432a2c2737bbceff201a7ba6..2945b1ec060314f8cc257d91a28219fafd9b5f40 100644 (file)
--- a/src/print_volume.c
+++ b/src/print_volume.c
@@ -27,19 +27,17 @@ struct mixer_hdl {
 };
 
 TAILQ_HEAD(handles_head, mixer_hdl) cached = TAILQ_HEAD_INITIALIZER(cached);
-#endif
 
 static void free_hdl(struct mixer_hdl *hdl) {
        free(hdl->device);
        free(hdl->mixer);
        free(hdl);
 }
+#endif
 
 void print_volume(const char *fmt, const char *device, const char *mixer, int mixer_idx) {
 /* Printing volume only works with ALSA at the moment */
-#ifndef LINUX
-       return;
-#endif
+#ifdef LINUX
        /* Check if we already opened the mixer and get the handle
         * from cache if so */
        bool found = false;
@@ -151,4 +149,5 @@ void print_volume(const char *fmt, const char *device, const char *mixer, int mi
                        walk += strlen("volume");
                }
        }
+#endif
 }

diff --git a/src/print_wireless_info.c b/src/print_wireless_info.c
index 3a96b86f93b3d10147c49cace6105cf516dd99fb..511a9ab4e4a7ca620c679322cf08a5d1d2842189 100644 (file)
--- a/src/print_wireless_info.c
+++ b/src/print_wireless_info.c
@@ -4,6 +4,8 @@
 
 #ifdef LINUX
 #include <iwlib.h>
+#else
+#define IW_ESSID_MAX_SIZE 32
 #endif
 
 #include "i3status.h"
@@ -140,6 +142,7 @@ static int get_wireless_info(const char *interface, wireless_info_t *info) {
         close(skfd);
         return 1;
 #endif
+       return 0;
 }
 
 void print_wireless_info(const char *interface, const char *format_up, const char *format_down) {
@@ -216,6 +219,7 @@ void print_wireless_info(const char *interface, const char *format_up, const cha
                         walk += strlen("ip");
                 }
 
+#ifdef LINUX
                 if (BEGINS_WITH(walk+1, "bitrate")) {
                         char buffer[128];
 
@@ -224,6 +228,7 @@ void print_wireless_info(const char *interface, const char *format_up, const cha
                         printf("%s", buffer);
                         walk += strlen("bitrate");
                 }
+#endif
         }
 
         (void)printf("%s", endcolor());