Changeset bc73be3 in mainline for uspace/lib/c/include/context.h


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/lib/c/include/context.h

    rad40b74b rbc73be3  
    2727 */
    2828
    29 #ifndef LIBC_CONTEXT_H_
    30 #define LIBC_CONTEXT_H_
     29#ifndef _LIBC_CONTEXT_H_
     30#define _LIBC_CONTEXT_H_
    3131
    3232#include <_bits/size_t.h>
    3333#include <libarch/fibril_context.h>
     34
     35typedef __context_t context_t;
    3436
    3537/* Context initialization data. */
Note: See TracChangeset for help on using the changeset viewer.