diff options
| author | Axel Beckert | 2011-07-21 21:52:04 +0200 |
|---|---|---|
| committer | Michael Stapelberg | 2011-07-21 22:02:34 +0200 |
| commit | 5e276db583ba94e8e303c8868df52ffcaa0819a4 (patch) | |
| tree | fb0dbd93898ed41676fda1efeef72bf68316c5ce | |
| parent | debian: update changelog (diff) | |
Fix FTBFS on kFreeBSD
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | src/print_volume.c | 7 | ||||
| -rw-r--r-- | src/print_wireless_info.c | 5 |
4 files changed, 14 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index bae6ed9..4acb470 100644 --- 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 af00323..4ca214c 100644 --- 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 0eca0c0..2945b1e 100644 --- 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 3a96b86..511a9ab 100644 --- 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()); |