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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/locsrv/locsrv.c

    rb5d2e57 r03362fbd  
    4242#include <stdio.h>
    4343#include <errno.h>
    44 #include <bool.h>
     44#include <stdbool.h>
    4545#include <fibril_synch.h>
    4646#include <macros.h>
     
    13531353        categ_dir_add_cat(&cdir, cat);
    13541354
     1355        cat = category_new("clock");
     1356        categ_dir_add_cat(&cdir, cat);
     1357
    13551358        cat = category_new("test3");
    13561359        categ_dir_add_cat(&cdir, cat);
     
    13661369       
    13671370        cat = category_new("nic");
     1371        categ_dir_add_cat(&cdir, cat);
     1372
     1373        cat = category_new("visualizer");
     1374        categ_dir_add_cat(&cdir, cat);
     1375
     1376        cat = category_new("renderer");
    13681377        categ_dir_add_cat(&cdir, cat);
    13691378       
Note: See TracChangeset for help on using the changeset viewer.