Changeset ab936440 in mainline for uspace/lib/c/include/ipc/ipc.h


Ignore:
Timestamp:
2019-02-12T20:42:42Z (7 years ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f31ca47
Parents:
7f7817a9 (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.
git-author:
Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)
git-committer:
Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)
Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/include/ipc/ipc.h

    r7f7817a9 rab936440  
    3333 */
    3434
    35 #if ((defined(LIBC_ASYNC_H_)) && (!defined(LIBC_ASYNC_C_)))
     35#if ((defined(_LIBC_ASYNC_H_)) && (!defined(_LIBC_ASYNC_C_)))
    3636#error Do not intermix low-level IPC interface and async framework
    3737#endif
    3838
    39 #ifndef LIBC_IPC_H_
    40 #define LIBC_IPC_H_
     39#ifndef _LIBC_IPC_H_
     40#define _LIBC_IPC_H_
    4141
    4242#include <ipc/common.h>
Note: See TracChangeset for help on using the changeset viewer.