Changeset 03362fbd in mainline for uspace/srv/locsrv/locsrv.c

Timestamp:

2013-02-09T23:14:45Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• uspace/srv/locsrv/locsrv.c (modified) (3 diffs)

uspace/srv/locsrv/locsrv.c

@@ -42 +42 @@
 #include <stdio.h>
 #include <errno.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <fibril_synch.h>
 #include <macros.h>
@@ -1353 +1353 @@
         categ_dir_add_cat(&cdir, cat);
 
+        cat = category_new("clock");
+        categ_dir_add_cat(&cdir, cat);
+
         cat = category_new("test3");
         categ_dir_add_cat(&cdir, cat);
@@ -1366 +1369 @@
         
         cat = category_new("nic");
+        categ_dir_add_cat(&cdir, cat);
+
+        cat = category_new("visualizer");
+        categ_dir_add_cat(&cdir, cat);
+
+        cat = category_new("renderer");
         categ_dir_add_cat(&cdir, cat);