Ignore:
Timestamp:
2019-02-11T22:31:04Z (6 years ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Children:
aaf9789c
Parents:
e3272101 (diff), 4805495 (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:

merging with upstream/master

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/generic/private/fibril.h

    re3272101 rd5a89a3  
    2727 */
    2828
    29 #ifndef LIBC_PRIVATE_FIBRIL_H_
    30 #define LIBC_PRIVATE_FIBRIL_H_
     29#ifndef _LIBC_PRIVATE_FIBRIL_H_
     30#define _LIBC_PRIVATE_FIBRIL_H_
    3131
    3232#include <adt/list.h>
     
    3535#include <abi/proc/uarg.h>
    3636#include <fibril.h>
     37#include <ipc/common.h>
    3738
    3839#include "./futex.h"
Note: See TracChangeset for help on using the changeset viewer.