diff options
Diffstat (limited to 'os/kernel/include')
| -rw-r--r-- | os/kernel/include/heap.h | 6 | ||||
| -rw-r--r-- | os/kernel/include/vt.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/os/kernel/include/heap.h b/os/kernel/include/heap.h index ab784479c..be95a41c5 100644 --- a/os/kernel/include/heap.h +++ b/os/kernel/include/heap.h @@ -47,9 +47,9 @@ typedef struct memory_heap MemoryHeap; */
struct heap_header {
union {
- struct heap_header *h_next; /**< @brief Next block in free list. */
- MemoryHeap *h_heap; /**< @brief Block owner heap. */
- };
+ struct heap_header *next; /**< @brief Next block in free list. */
+ MemoryHeap *heap; /**< @brief Block owner heap. */
+ } h_u; /**< @brief Overlapped fields. */
size_t h_size; /**< @brief Size of the memory block. */
};
diff --git a/os/kernel/include/vt.h b/os/kernel/include/vt.h index 20a64ec95..455545cc6 100644 --- a/os/kernel/include/vt.h +++ b/os/kernel/include/vt.h @@ -88,7 +88,7 @@ extern VTList vtlist; --vtlist.vt_next->vt_time; \
while (!(vtp = vtlist.vt_next)->vt_time) { \
vtfunc_t fn = vtp->vt_func; \
- vtp->vt_func = NULL; \
+ vtp->vt_func = (vtfunc_t)NULL; \
vtp->vt_next->vt_prev = (void *)&vtlist; \
(&vtlist)->vt_next = vtp->vt_next; \
fn(vtp->vt_par); \
|