diff options
Diffstat (limited to 'meta-initramfs/recipes-bsp/kexecboot/files/0001-Fix-argument-errors-in-gcc-15.patch')
-rw-r--r-- | meta-initramfs/recipes-bsp/kexecboot/files/0001-Fix-argument-errors-in-gcc-15.patch | 90 |
1 files changed, 90 insertions, 0 deletions
diff --git a/meta-initramfs/recipes-bsp/kexecboot/files/0001-Fix-argument-errors-in-gcc-15.patch b/meta-initramfs/recipes-bsp/kexecboot/files/0001-Fix-argument-errors-in-gcc-15.patch new file mode 100644 index 0000000000..3f2aac9469 --- /dev/null +++ b/meta-initramfs/recipes-bsp/kexecboot/files/0001-Fix-argument-errors-in-gcc-15.patch | |||
@@ -0,0 +1,90 @@ | |||
1 | From d18d3fb700540646f4b79f6c6788614ffff735f6 Mon Sep 17 00:00:00 2001 | ||
2 | From: "mark.yang" <mark.yang@lge.com> | ||
3 | Date: Thu, 24 Apr 2025 16:17:49 +0900 | ||
4 | Subject: [PATCH] Fix argument errors in gcc 15 | ||
5 | |||
6 | * fix following errors: | ||
7 | ../../git/src/fb.c: In function 'fb_new': | ||
8 | ../../git/src/fb.c:646:17: error: too many arguments to function 'fb_destroy'; expected 0, have 1 | ||
9 | 646 | fb_destroy(fb); | ||
10 | | ^~~~~~~~~~ ~~ | ||
11 | ../../git/src/fb.c:391:6: note: declared here | ||
12 | 391 | void fb_destroy() | ||
13 | | ^~~~~~~~~~ | ||
14 | ../../git/src/tui.c:102:9: error: conflicting types for 'tui_init'; have 'kx_tui *(FILE *)' | ||
15 | 102 | kx_tui *tui_init(FILE *ts) | ||
16 | | ^~~~~~~~ | ||
17 | In file included from ../../git/src/tui.c:40: | ||
18 | ../../git/src/tui.h:36:9: note: previous declaration of 'tui_init' with type 'kx_tui *(void)' | ||
19 | 36 | kx_tui *tui_init(); | ||
20 | ... | ||
21 | Upstream-Status: Submitted [https://github.com/kexecboot/kexecboot/pull/30] | ||
22 | Signed-off-by: mark.yang <mark.yang@lge.com> | ||
23 | --- | ||
24 | src/fb.c | 4 ++-- | ||
25 | src/fb.h | 2 +- | ||
26 | src/gui.c | 2 +- | ||
27 | src/tui.h | 2 +- | ||
28 | 4 files changed, 5 insertions(+), 5 deletions(-) | ||
29 | |||
30 | diff --git a/src/fb.c b/src/fb.c | ||
31 | index c68009f..6acd9f2 100644 | ||
32 | --- a/src/fb.c | ||
33 | +++ b/src/fb.c | ||
34 | @@ -388,7 +388,7 @@ void fb_restore(char *dump) | ||
35 | } | ||
36 | |||
37 | |||
38 | -void fb_destroy() | ||
39 | +void fb_destroy(FB fb) | ||
40 | { | ||
41 | if (fb.fd >= 0) | ||
42 | close(fb.fd); | ||
43 | @@ -651,7 +651,7 @@ int fb_new(int angle) | ||
44 | return 0; | ||
45 | |||
46 | fail: | ||
47 | - fb_destroy(); | ||
48 | + fb_destroy(fb); | ||
49 | return -1; | ||
50 | } | ||
51 | |||
52 | diff --git a/src/fb.h b/src/fb.h | ||
53 | index 4a1e0d7..9e0af18 100644 | ||
54 | --- a/src/fb.h | ||
55 | +++ b/src/fb.h | ||
56 | @@ -88,7 +88,7 @@ typedef struct { | ||
57 | } kx_picture; | ||
58 | |||
59 | |||
60 | -void fb_destroy(); | ||
61 | +void fb_destroy(FB fb); | ||
62 | |||
63 | int fb_new(int angle); | ||
64 | |||
65 | diff --git a/src/gui.c b/src/gui.c | ||
66 | index bf4230a..a140c9b 100644 | ||
67 | --- a/src/gui.c | ||
68 | +++ b/src/gui.c | ||
69 | @@ -157,7 +157,7 @@ void gui_destroy(struct gui_t *gui) | ||
70 | free(gui->icons); | ||
71 | #endif | ||
72 | |||
73 | - fb_destroy(); | ||
74 | + fb_destroy(fb); | ||
75 | free(gui); | ||
76 | } | ||
77 | |||
78 | diff --git a/src/tui.h b/src/tui.h | ||
79 | index feed233..79faac0 100644 | ||
80 | --- a/src/tui.h | ||
81 | +++ b/src/tui.h | ||
82 | @@ -33,7 +33,7 @@ typedef struct { | ||
83 | } kx_tui; | ||
84 | |||
85 | |||
86 | -kx_tui *tui_init(); | ||
87 | +kx_tui *tui_init(FILE *ts); | ||
88 | |||
89 | void tui_show_menu(kx_tui *tui, kx_menu *menu); | ||
90 | |||