Changeset 7715994 in mainline for kernel/generic/src/console/cmd.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:

• kernel/generic/src/console/cmd.c (modified) (2 diffs)

kernel/generic/src/console/cmd.c

@@ -1033 +1033 @@
         /* Execute the test */
         test_quiet = false;
-        char *ret = test->entry();
+        const char *ret = test->entry();
         
         /* Update and read thread accounting */
@@ -1086 +1086 @@
                 /* Execute the test */
                 test_quiet = true;
-                char * ret = test->entry();
+                const char *ret = test->entry();
                 
                 /* Update and read thread accounting */