diff options
| author | June McEnroe <programble@gmail.com> | 2018-03-05 12:39:40 -0500 |
|---|---|---|
| committer | June McEnroe <programble@gmail.com> | 2018-03-05 12:39:40 -0500 |
| commit | 456b632b849de3a9615ef17b51cf27046234f6f4 (patch) | |
| tree | 3488cfc8e70857522fc920b5aad98b91a350d23b | |
| parent | Generate tags (diff) | |
| download | torus-456b632b849de3a9615ef17b51cf27046234f6f4.tar.gz torus-456b632b849de3a9615ef17b51cf27046234f6f4.zip | |
Undef COLOR_ constants in torus.h
| -rw-r--r-- | client.c | 8 | ||||
| -rw-r--r-- | merge.c | 8 | ||||
| -rw-r--r-- | torus.h | 9 |
3 files changed, 9 insertions, 16 deletions
diff --git a/client.c b/client.c index fe7c62b..e8d97f1 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 ca4ccb5..2333e9d 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 661d47a..fd158ed 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, |