More robust preprocessor switches - slstatus - suckless status monitor. mirror from suckless.org
 (HTM) git clone git://git.drkhsh.at/slstatus.git
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit e79d4932ea413c277425ff92c456741e0730c3d6
 (DIR) parent fc5d23212fdaec8c242db9b25770f290dd287212
 (HTM) Author: Aaron Marcher <me@drkhsh.at>
       Date:   Wed, 21 Mar 2018 12:21:37 +0100
       
       More robust preprocessor switches
       
       Replace #ifdef with #if defined() and #elif with #elif defined() as it
       should only test if it is defined or not.
       
       Diffstat:
         M components/battery.c                |      10 +++++-----
         M components/cpu.c                    |       2 +-
         M components/entropy.c                |       2 +-
         M components/ip.c                     |       2 +-
         M components/ram.c                    |       2 +-
         M components/swap.c                   |       2 +-
         M components/temperature.c            |       2 +-
         M components/uptime.c                 |       8 ++++----
         M components/volume.c                 |       2 +-
         M components/wifi.c                   |       2 +-
       
       10 files changed, 17 insertions(+), 17 deletions(-)
       ---
 (DIR) diff --git a/components/battery.c b/components/battery.c
       @@ -1,10 +1,10 @@
        /* See LICENSE file for copyright and license details. */
        #include <err.h>
        #include <stdio.h>
       -#ifdef __linux__
       +#if defined(__linux__)
        #include <limits.h>
        #include <string.h>
       -#elif __OpenBSD__
       +#elif defined(__OpenBSD__)
        #include <sys/ioctl.h>
        #include <fcntl.h>
        #include <unistd.h>
       @@ -16,14 +16,14 @@
        const char *
        battery_perc(const char *bat)
        {
       -#ifdef __linux__
       +#if defined(__linux__)
                int perc;
                char path[PATH_MAX];
        
                snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/capacity");
                return (pscanf(path, "%i", &perc) == 1) ?
                       bprintf("%d", perc) : NULL;
       -#elif __OpenBSD__
       +#elif defined(__OpenBSD__)
                struct apm_power_info apm_info;
                int fd;
        
       @@ -44,7 +44,7 @@ battery_perc(const char *bat)
        #endif
        }
        
       -#ifdef __linux__
       +#if defined(__linux__)
        const char *
        battery_power(const char *bat)
        {
 (DIR) diff --git a/components/cpu.c b/components/cpu.c
       @@ -1,5 +1,5 @@
        /* See LICENSE file for copyright and license details. */
       -#ifdef __linux__
       +#if defined(__linux__)
        #include <stdio.h>
        #include <string.h>
        
 (DIR) diff --git a/components/entropy.c b/components/entropy.c
       @@ -1,5 +1,5 @@
        /* See LICENSE file for copyright and license details. */
       -#ifdef __linux__
       +#if defined(__linux__)
        #include <stdio.h>
        
        #include "../util.h"
 (DIR) diff --git a/components/ip.c b/components/ip.c
       @@ -1,5 +1,5 @@
        /* See LICENSE file for copyright and license details. */
       -#ifdef __linux__
       +#if defined(__linux__)
        #include <err.h>
        #include <ifaddrs.h>
        #include <netdb.h>
 (DIR) diff --git a/components/ram.c b/components/ram.c
       @@ -1,5 +1,5 @@
        /* See LICENSE file for copyright and license details. */
       -#ifdef __linux__
       +#if defined(__linux__)
        #include <stdio.h>
        
        #include "../util.h"
 (DIR) diff --git a/components/swap.c b/components/swap.c
       @@ -1,5 +1,5 @@
        /* See LICENSE file for copyright and license details. */
       -#ifdef __linux__
       +#if defined(__linux__)
        #include <err.h>
        #include <stdio.h>
        #include <string.h>
 (DIR) diff --git a/components/temperature.c b/components/temperature.c
       @@ -1,5 +1,5 @@
        /* See LICENSE file for copyright and license details. */
       -#ifdef __linux__
       +#if defined(__linux__)
        #include <stdio.h>
        
        #include "../util.h"
 (DIR) diff --git a/components/uptime.c b/components/uptime.c
       @@ -1,8 +1,8 @@
        /* See LICENSE file for copyright and license details. */
        #include <stdio.h>
       -#ifdef __linux__
       +#if defined(__linux__)
        #include <sys/sysinfo.h>
       -#elif __OpenBSD__
       +#elif defined(__OpenBSD__)
        #include <sys/sysctl.h>
        #include <sys/time.h>
        #endif
       @@ -15,12 +15,12 @@ uptime(void)
                int h;
                int m;
                int uptime = 0;
       -#ifdef __linux__
       +#if defined(__linux__)
                struct sysinfo info;
        
                sysinfo(&info);
                uptime = info.uptime;
       -#elif __OpenBSD__
       +#elif defined(__OpenBSD__)
                int mib[2];
                size_t size;
                time_t now;
 (DIR) diff --git a/components/volume.c b/components/volume.c
       @@ -1,5 +1,5 @@
        /* See LICENSE file for copyright and license details. */
       -#ifdef __linux__
       +#if defined(__linux__)
        #include <err.h>
        #include <fcntl.h>
        #include <sys/soundcard.h>
 (DIR) diff --git a/components/wifi.c b/components/wifi.c
       @@ -1,5 +1,5 @@
        /* See LICENSE file for copyright and license details. */
       -#ifdef __linux__
       +#if defined(__linux__)
        #include <err.h>
        #include <ifaddrs.h>
        #include <linux/wireless.h>