Changeset d011038 in mainline for uspace/app/sbi/src/builtin.c

Timestamp:

2011-03-29T20:12:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8f17503

Parents:

c4fb95d3 (diff), 93ebe4e (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/sbi/src/builtin.c (modified) (3 diffs)

uspace/app/sbi/src/builtin.c

@@ -43 +43 @@
 #include "builtin/bi_error.h"
 #include "builtin/bi_char.h"
-#include "builtin/bi_fun.h"
+#include "builtin/bi_console.h"
 #include "builtin/bi_int.h"
+#include "builtin/bi_task.h"
 #include "builtin/bi_textfile.h"
 #include "builtin/bi_string.h"
@@ -93 +94 @@
         bi_error_declare(bi);
         bi_char_declare(bi);
-        bi_fun_declare(bi);
+        bi_console_declare(bi);
         bi_int_declare(bi);
+        bi_task_declare(bi);
         bi_textfile_declare(bi);
         bi_string_declare(bi);
@@ -111 +113 @@
         bi_error_bind(bi);
         bi_char_bind(bi);
-        bi_fun_bind(bi);
+        bi_console_bind(bi);
         bi_int_bind(bi);
+        bi_task_bind(bi);
         bi_textfile_bind(bi);
         bi_string_bind(bi);