Ignore:
Timestamp:
2014-09-12T13:22:33Z (10 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9b20126
Parents:
8db09e4 (diff), 105d8d6 (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

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/app/taskdump/include/fibrildump.h

    r8db09e4 r15d0046  
    11/*
    2  * Copyright (c) 2005 Ondrej Palkovsky
     2 * Copyright (c) 2014 Jiri Svoboda
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup libcmips64
     29/** @addtogroup edit
    3030 * @{
    3131 */
    32 /** @file
     32/**
     33 * @file
    3334 */
    3435
    35 #ifndef LIBC_mips64_FADDR_H_
    36 #define LIBC_mips64_FADDR_H_
     36#ifndef FIBRILDUMP_H
     37#define FIBRILDUMP_H
    3738
    38 #include <libarch/types.h>
     39#include <async.h>
     40#include <symtab.h>
    3941
    40 #define FADDR(fptr)  ((uintptr_t) (fptr))
     42extern int fibrils_dump(symtab_t *, async_sess_t *sess);
    4143
    4244#endif
Note: See TracChangeset for help on using the changeset viewer.