Ignore:
Timestamp:
2017-10-17T13:11:35Z (7 years ago)
Author:
Ondřej Hlavatý <aearsis@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
60af4cdb
Parents:
dbf32b1 (diff), a416d070 (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/arch/ia32/src/rtld/reloc.c

    rdbf32b1 r95c675b  
    3737#include <stdio.h>
    3838#include <stdlib.h>
     39#include <inttypes.h>
    3940
    4041#include <libarch/rtld/elf_dyn.h>
     
    7980        str_tab = m->dyn.str_tab;
    8081
    81         DPRINTF("address: 0x%x, entries: %d\n", (uintptr_t)rt, rt_entries);
     82        DPRINTF("address: 0x%" PRIxPTR ", entries: %zd\n", (uintptr_t)rt, rt_entries);
    8283       
    8384        for (i = 0; i < rt_entries; ++i) {
Note: See TracChangeset for help on using the changeset viewer.