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


Ignore:
Timestamp:
2019-06-27T08:51:20Z (7 years ago)
Author:
Jaroslav Jindrak <dzejrou@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8add15e0
Parents:
ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/taskdump/symtab.c

    rad40b74b rbc73be3  
    215215                        continue;
    216216
    217                 stype = ELF_ST_TYPE(st->sym[i].st_info);
     217                stype = elf_st_type(st->sym[i].st_info);
    218218                if (stype != STT_OBJECT && stype != STT_FUNC)
    219219                        continue;
    … …  
    257257                        continue;
    258258
    259                 stype = ELF_ST_TYPE(st->sym[i].st_info);
     259                stype = elf_st_type(st->sym[i].st_info);
    260260                if (stype != STT_OBJECT && stype != STT_FUNC &&
    261261                    stype != STT_NOTYPE) {
Note: See TracChangeset for help on using the changeset viewer.