Changeset 371bd7d in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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) (3 diffs)

kernel/generic/src/console/cmd.c

@@ -46 +46 @@
 #include <print.h>
 #include <panic.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
 #include <arch.h>
 #include <config.h>
 #include <func.h>
-#include <string.h>
+#include <str.h>
 #include <macros.h>
 #include <debug.h>
@@ -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 */