Changeset 6843a9c in mainline for uspace/app/sbi/src/stype.c

Timestamp:

2012-06-29T13:02:14Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/app/sbi/src/stype.c (modified) (1 diff)

uspace/app/sbi/src/stype.c

@@ -652 +652 @@
         assert(iface_ti->tic == tic_tobject);
         iface = iface_ti->u.tobject->csi;
-        assert(iface->cc = csi_interface);
+        assert(iface->cc == csi_interface);
 
 #ifdef DEBUG_TYPE_TRACE