termcolors: Rename COLOR_* macros to FG_* due to conflict with ncurses

Also, FG_* is even better since we already have BG_* ones.
alexR89 · May 23, 2022 · d2ff796 · d2ff796
1 parent c2e237a
commit d2ff796
Showing 1 changed file with 24 additions and 24 deletions.
diff --git a/include/libimobiledevice-glue/termcolors.h b/include/libimobiledevice-glue/termcolors.h
@@ -31,30 +31,30 @@
 #define STYLE_NORMAL          "\e[0m"
 #define STYLE_BRIGHT          "\e[1m"
 #define STYLE_DARK            "\e[2m"
-#define COLOR_BLACK           "\e[0;30m"
-#define COLOR_DARK_GRAY       "\e[1;30m"
-#define COLOR_RED             "\e[0;31m"
-#define COLOR_BRIGHT_RED      "\e[1;31m"
-#define COLOR_DARK_RED        "\e[2;31m"
-#define COLOR_GREEN           "\e[0;32m"
-#define COLOR_BRIGHT_GREEN    "\e[1;32m"
-#define COLOR_DARK_GREEN      "\e[2;32m"
-#define COLOR_YELLOW          "\e[0;33m"
-#define COLOR_BRIGHT_YELLOW   "\e[1;33m"
-#define COLOR_DARK_YELLOW     "\e[2;33m"
-#define COLOR_BLUE            "\e[0;34m"
-#define COLOR_BRIGHT_BLUE     "\e[1;34m"
-#define COLOR_DARK_BLUE       "\e[2;34m"
-#define COLOR_MAGENTA         "\e[0;35m"
-#define COLOR_BRIGHT_MAGENTA  "\e[1;35m"
-#define COLOR_DARK_MAGENTA    "\e[2;35m"
-#define COLOR_CYAN            "\e[0;36m"
-#define COLOR_BRIGHT_CYAN     "\e[1;36m"
-#define COLOR_DARK_CYAN       "\e[2;36m"
-#define COLOR_LIGHT_GRAY      "\e[0;37m"
-#define COLOR_WHITE           "\e[1;37m"
-#define COLOR_GRAY            "\e[2;37m"
-#define COLOR_DEFAULT         "\e[39m"
+#define FG_BLACK              "\e[0;30m"
+#define FG_DARK_GRAY          "\e[1;30m"
+#define FG_RED                "\e[0;31m"
+#define FG_BRIGHT_RED         "\e[1;31m"
+#define FG_DARK_RED           "\e[2;31m"
+#define FG_GREEN              "\e[0;32m"
+#define FG_BRIGHT_GREEN       "\e[1;32m"
+#define FG_DARK_GREEN         "\e[2;32m"
+#define FG_YELLOW             "\e[0;33m"
+#define FG_BRIGHT_YELLOW      "\e[1;33m"
+#define FG_DARK_YELLOW        "\e[2;33m"
+#define FG_BLUE               "\e[0;34m"
+#define FG_BRIGHT_BLUE        "\e[1;34m"
+#define FG_DARK_BLUE          "\e[2;34m"
+#define FG_MAGENTA            "\e[0;35m"
+#define FG_BRIGHT_MAGENTA     "\e[1;35m"
+#define FG_DARK_MAGENTA       "\e[2;35m"
+#define FG_CYAN               "\e[0;36m"
+#define FG_BRIGHT_CYAN        "\e[1;36m"
+#define FG_DARK_CYAN          "\e[2;36m"
+#define FG_LIGHT_GRAY         "\e[0;37m"
+#define FG_WHITE              "\e[1;37m"
+#define FG_GRAY               "\e[2;37m"
+#define FG_DEFAULT            "\e[39m"
 #define BG_BLACK              "\e[40m"
 #define BG_GRAY               "\e[100m"
 #define BG_RED                "\e[41m"