Changeset bc73be3 in mainline for uspace/lib/c/include/barrier.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/barrier.h

    rad40b74b rbc73be3  
    3333 */
    3434
    35 #ifndef LIBC_COMPILER_BARRIER_H_
    36 #define LIBC_COMPILER_BARRIER_H_
     35#ifndef _LIBC_COMPILER_BARRIER_H_
     36#define _LIBC_COMPILER_BARRIER_H_
    3737
    3838#include <stdatomic.h>
    … …  
    6161#define ACCESS_ONCE(var) (*((volatile typeof(var)*)&(var)))
    6262
    63 #endif /* LIBC_COMPILER_BARRIER_H_ */
     63#endif /* _LIBC_COMPILER_BARRIER_H_ */
Note: See TracChangeset for help on using the changeset viewer.