Changeset 7715994 in mainline for uspace/app/tester/console/console1.c

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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/app/tester/console/console1.c (modified) (2 diffs)

uspace/app/tester/console/console1.c

@@ -36 +36 @@
 #include "../tester.h"
 
-const char *color_name[] = {
+static const char *color_name[] = {
         [COLOR_BLACK] = "black",
         [COLOR_BLUE] = "blue",
@@ -47 +47 @@
 };
 
-char *test_console1(void)
+const char *test_console1(void)
 {
         if (!test_quiet) {