Changeset db71e2a in mainline for uspace/app/taskdump/symtab.c

Timestamp:

2013-07-24T17:42:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• uspace/app/taskdump/symtab.c (modified) (1 diff)

uspace/app/taskdump/symtab.c

@@ -267 +267 @@
                         continue;
 
-                if (best_name == NULL || (saddr <= addr && saddr > best_addr)) {
+                if (saddr <= addr && (best_name == NULL || saddr > best_addr)) {
                         best_name = sname;
                         best_addr = saddr;