From 0dc12cb1cac1c717ed2cc104635abb98e8efa2dd Mon Sep 17 00:00:00 2001 From: fslongjin Date: Thu, 4 Aug 2022 22:14:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BC=96=E8=AF=91=E5=99=A8?= =?UTF-8?q?=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/common/bitree.c | 2 +- kernel/driver/multiboot2/multiboot2.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/common/bitree.c b/kernel/common/bitree.c index bcb21e18..02c5d4f4 100644 --- a/kernel/common/bitree.c +++ b/kernel/common/bitree.c @@ -53,7 +53,7 @@ struct bt_node_t *bt_create_node(struct bt_node_t *left, struct bt_node_t *right return node; nomem:; - return -ENOMEM; + return (void*)-ENOMEM; } /** * @brief 插入结点 diff --git a/kernel/driver/multiboot2/multiboot2.h b/kernel/driver/multiboot2/multiboot2.h index 4dbd4d44..7bc18e32 100644 --- a/kernel/driver/multiboot2/multiboot2.h +++ b/kernel/driver/multiboot2/multiboot2.h @@ -294,7 +294,7 @@ struct multiboot_tag_framebuffer_info_t // indexed color struct multiboot_tag_framebuffer_info_type0_t { - struct multiboot_tag_framebuffer_info_t; + struct multiboot_tag_framebuffer_info_t header; uint32_t framebuffer_palette_num_colors; struct multiboot_color_t color_desc; }; @@ -302,7 +302,7 @@ struct multiboot_tag_framebuffer_info_type0_t // direct RGB color struct multiboot_tag_framebuffer_info_type1_t { - struct multiboot_tag_framebuffer_info_t; + struct multiboot_tag_framebuffer_info_t header; uint8_t framebuffer_red_field_position; uint8_t framebuffer_red_mask_size;