[PATCH 3/7] score: Fix extern "C" in <rtems/score/heap.h>

Joel Sherrill joel.sherrill at oarcorp.com
Thu Jun 25 13:23:09 UTC 2015



On 6/25/2015 8:22 AM, Sebastian Huber wrote:
>
>
> On 25/06/15 15:20, Joel Sherrill wrote:
>> The comment doesn't appear to match the change.
>
> The problem is that the extern "C" covers the #include
> <rtems/score/thread.h>.

OK. I missed that. I obviously need more caffeine this
morning.

>> On 6/25/2015 8:17 AM, Sebastian Huber wrote:
>>> ---
>>>    cpukit/score/include/rtems/score/heap.h | 3 +--
>>>    1 file changed, 1 insertion(+), 2 deletions(-)
>>>
>>> diff --git a/cpukit/score/include/rtems/score/heap.h
>>> b/cpukit/score/include/rtems/score/heap.h
>>> index ab627b6..5db22cf 100644
>>> --- a/cpukit/score/include/rtems/score/heap.h
>>> +++ b/cpukit/score/include/rtems/score/heap.h
>>> @@ -19,6 +19,7 @@
>>>    #define _RTEMS_SCORE_HEAP_H
>>>
>>>    #include <rtems/score/cpu.h>
>>> +#include <rtems/score/thread.h>
>>>
>>>    #ifdef __cplusplus
>>>    extern "C" {
>>> @@ -135,8 +136,6 @@ typedef struct Heap_Block Heap_Block;
>>>    #ifndef HEAP_PROTECTION
>>>      #define HEAP_PROTECTION_HEADER_SIZE 0
>>>    #else
>>> -  #include <rtems/score/thread.h>
>>> -
>>>      #define HEAP_PROTECTOR_COUNT 2
>>>
>>>      #define HEAP_BEGIN_PROTECTOR_0 ((uintptr_t) 0xfd75a98f)
>>>
>>
>

-- 
Joel Sherrill, Ph.D.             Director of Research & Development
joel.sherrill at OARcorp.com        On-Line Applications Research
Ask me about RTEMS: a free RTOS  Huntsville AL 35805
Support Available                (256) 722-9985



More information about the devel mailing list