Changeset ab936440 in mainline for uspace/lib/c/arch/arm32/include/libarch/fibril_context.h

Timestamp:

2019-02-12T20:42:42Z (6 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:

• uspace/lib/c/arch/arm32/include/libarch/fibril_context.h (modified) (3 diffs)

uspace/lib/c/arch/arm32/include/libarch/fibril_context.h

@@ -27 +27 @@
  */
 
-#ifndef LIBC_ARCH_FIBRIL_CONTEXT_H_
-#define LIBC_ARCH_FIBRIL_CONTEXT_H_
+#ifndef _LIBC_ARCH_FIBRIL_CONTEXT_H_
+#define _LIBC_ARCH_FIBRIL_CONTEXT_H_
 
 #include <stdint.h>
@@ -41 +41 @@
 // XXX: This struct must match the assembly code in src/fibril.S
 
-typedef struct context {
+typedef struct __context {
         uintptr_t sp;
         uintptr_t pc;
@@ -54 +54 @@
         /* r11 */
         uint32_t fp;
-} context_t;
+} __context_t;
 
 #endif