Ignore:
Timestamp:
2019-02-03T14:35:44Z (6 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b4f1171
Parents:
67ca359
Message:

Rename context_t to context_t

<libarch/fibril_context.h> is included from <setjmp.h> where it can interfere
with identifiers used in third-party code.
The simplest solution here is just to prefix the names with double underscore
which is reserved for use by the implementation.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/arch/ppc32/include/libarch/fibril_context.h

    r67ca359 ra5c78a18  
    3030#define LIBC_ARCH_FIBRIL_CONTEXT_H_
    3131
    32 #define CONTEXT_OFFSET_SP   0x00
    33 #define CONTEXT_OFFSET_PC   0x04
    34 #define CONTEXT_OFFSET_TLS  0x08
    35 #define CONTEXT_OFFSET_R13  0x0c
    36 #define CONTEXT_OFFSET_R14  0x10
    37 #define CONTEXT_OFFSET_R15  0x14
    38 #define CONTEXT_OFFSET_R16  0x18
    39 #define CONTEXT_OFFSET_R17  0x1c
    40 #define CONTEXT_OFFSET_R18  0x20
    41 #define CONTEXT_OFFSET_R19  0x24
    42 #define CONTEXT_OFFSET_R20  0x28
    43 #define CONTEXT_OFFSET_R21  0x2c
    44 #define CONTEXT_OFFSET_R22  0x30
    45 #define CONTEXT_OFFSET_R23  0x34
    46 #define CONTEXT_OFFSET_R24  0x38
    47 #define CONTEXT_OFFSET_R25  0x3c
    48 #define CONTEXT_OFFSET_R26  0x40
    49 #define CONTEXT_OFFSET_R27  0x44
    50 #define CONTEXT_OFFSET_R28  0x48
    51 #define CONTEXT_OFFSET_R29  0x4c
    52 #define CONTEXT_OFFSET_R30  0x50
    53 #define CONTEXT_OFFSET_R31  0x54
    54 #define CONTEXT_OFFSET_CR   0x58
    55 #define CONTEXT_SIZE        0x5c
     32#define __CONTEXT_OFFSET_SP   0x00
     33#define __CONTEXT_OFFSET_PC   0x04
     34#define __CONTEXT_OFFSET_TLS  0x08
     35#define __CONTEXT_OFFSET_R13  0x0c
     36#define __CONTEXT_OFFSET_R14  0x10
     37#define __CONTEXT_OFFSET_R15  0x14
     38#define __CONTEXT_OFFSET_R16  0x18
     39#define __CONTEXT_OFFSET_R17  0x1c
     40#define __CONTEXT_OFFSET_R18  0x20
     41#define __CONTEXT_OFFSET_R19  0x24
     42#define __CONTEXT_OFFSET_R20  0x28
     43#define __CONTEXT_OFFSET_R21  0x2c
     44#define __CONTEXT_OFFSET_R22  0x30
     45#define __CONTEXT_OFFSET_R23  0x34
     46#define __CONTEXT_OFFSET_R24  0x38
     47#define __CONTEXT_OFFSET_R25  0x3c
     48#define __CONTEXT_OFFSET_R26  0x40
     49#define __CONTEXT_OFFSET_R27  0x44
     50#define __CONTEXT_OFFSET_R28  0x48
     51#define __CONTEXT_OFFSET_R29  0x4c
     52#define __CONTEXT_OFFSET_R30  0x50
     53#define __CONTEXT_OFFSET_R31  0x54
     54#define __CONTEXT_OFFSET_CR   0x58
     55#define __CONTEXT_SIZE        0x5c
    5656
    5757#ifndef __ASSEMBLER__
     
    6060#include <stdint.h>
    6161
    62 typedef struct context {
     62typedef struct __context {
    6363        uint32_t sp;
    6464        uint32_t pc;
     
    8484        uint32_t r31;
    8585        uint32_t cr;
    86 } context_t;
     86} __context_t;
    8787
    8888#endif
Note: See TracChangeset for help on using the changeset viewer.