summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2018-03-05 12:39:40 -0500
committerJune McEnroe <june@causal.agency>2018-03-05 12:39:40 -0500
commit2dda5826731ce18d0d24ae3d13de1c80008227e6 (patch)
tree24d7eaf113397e8b799114388f49cb77ed49a4a8
parentGenerate tags (diff)
downloadtorus-2dda5826731ce18d0d24ae3d13de1c80008227e6.tar.gz
torus-2dda5826731ce18d0d24ae3d13de1c80008227e6.zip
Undef COLOR_ constants in torus.h
Diffstat (limited to '')
-rw-r--r--client.c8
-rw-r--r--merge.c8
-rw-r--r--torus.h9
3 files changed, 9 insertions, 16 deletions
diff --git a/client.c b/client.c
index 8238749..a216a63 100644
--- a/client.c
+++ b/client.c
@@ -27,14 +27,6 @@
 #include <sysexits.h>
 #include <unistd.h>
 
-#undef COLOR_BLACK
-#undef COLOR_RED
-#undef COLOR_GREEN
-#undef COLOR_YELLOW
-#undef COLOR_BLUE
-#undef COLOR_MAGENTA
-#undef COLOR_CYAN
-#undef COLOR_WHITE
 #include "torus.h"
 
 #define ESC (0x1B)
diff --git a/merge.c b/merge.c
index dc81756..e59d989 100644
--- a/merge.c
+++ b/merge.c
@@ -21,14 +21,6 @@
 #include <sysexits.h>
 #include <unistd.h>
 
-#undef COLOR_BLACK
-#undef COLOR_RED
-#undef COLOR_GREEN
-#undef COLOR_YELLOW
-#undef COLOR_BLUE
-#undef COLOR_MAGENTA
-#undef COLOR_CYAN
-#undef COLOR_WHITE
 #include "torus.h"
 
 static ssize_t writeAll(int fd, const char *buf, size_t len) {
diff --git a/torus.h b/torus.h
index 076cff9..5f8eb9a 100644
--- a/torus.h
+++ b/torus.h
@@ -22,6 +22,15 @@
 
 #define ALIGNED(x) __attribute__((aligned(x)))
 
+#undef COLOR_BLACK
+#undef COLOR_RED
+#undef COLOR_GREEN
+#undef COLOR_YELLOW
+#undef COLOR_BLUE
+#undef COLOR_MAGENTA
+#undef COLOR_CYAN
+#undef COLOR_WHITE
+
 enum {
     COLOR_BLACK,
     COLOR_RED,