status

Commit: c178e95283eddd9eee1199eef7106bdd8880dc53
Parent: eb6f5c36a61227fcf7fb14381521bd913ada29b6
Author: opask
Date:   Thu, 21 Feb 2019 18:44:46 -0700

Remove #ifdefs, include OS specific .c files via config.mk

Diffstat:
M
Makefile
 | 
2
+-
M
config.mk
 | 
4
++++
M
linux.c
 | 
7
++-----
M
openbsd.c
 | 
8
++------

4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 include config.mk
 
-SRC = status.c linux.c openbsd.c
+SRC += status.c
 OBJ = $(SRC:.c=.o)
 
 all: status
diff --git a/config.mk b/config.mk
@@ -1,3 +1,7 @@
+# Uncomment based on your OS
+SRC = linux.c
+#SRC = openbsd.c
+
 PREFIX = /
 
 X11INC = /usr/X11R6/include
diff --git a/linux.c b/linux.c
@@ -1,12 +1,11 @@
 #include <limits.h>
 #include <stdio.h>
 
-#include "status.h"
-
-#if defined(__linux__)
 #include <alsa/asoundlib.h>
 #include <alsa/mixer.h>
 
+#include "status.h"
+
 int
 getvol(const char *card, const char *output)
 {
@@ -73,5 +72,3 @@ batinfo(const char *bat)
 
 	return smprintf("%d%% (%s)", perc, state);
 }
-
-#endif
diff --git a/openbsd.c b/openbsd.c
@@ -1,12 +1,10 @@
-#include "status.h"
-
-#if defined(__OpenBSD__)
-
 #include <fcntl.h>
 #include <machine/apmvar.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
 
+#include "status.h"
+
 int
 getvol(const char *card, const char *output)
 {
@@ -40,5 +38,3 @@ batinfo(const char *bat)
 		return smprintf("%d%% (unknown)", pi.battery_life);
 	}
 }
-
-#endif