Changeset 00aece0 in mainline for uspace/lib/c/include/io/color.h

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/c/include/io/color.h (modified) (1 diff)

uspace/lib/c/include/io/color.h

@@ -44 +44 @@
         COLOR_MAGENTA = 5,
         COLOR_YELLOW  = 6,
-        COLOR_WHITE   = 7,
-        
-        CATTR_BRIGHT  = 8,
-        CATTR_BLINK   = 8
+        COLOR_WHITE   = 7
 } console_color_t;
+
+typedef enum {
+        CATTR_NORMAL = 0,
+        CATTR_BRIGHT = 8,
+        CATTR_BLINK  = 16
+} console_color_attr_t;
 
 #endif