[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 3/3] pc-bios/s390-ccw: Add a proper prototype for main()
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH 3/3] pc-bios/s390-ccw: Add a proper prototype for main() |
Date: |
Wed, 12 May 2021 21:54:13 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 |
On 5/12/21 7:15 PM, Thomas Huth wrote:
> Older versions of Clang complain if there is no prototype for main().
> Add one, and while we're at it, make sure that we use the same type
> for main.c and netmain.c - since the return value does not matter,
> declare the return type of main() as "void".
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> pc-bios/s390-ccw/main.c | 3 +--
> pc-bios/s390-ccw/s390-ccw.h | 1 +
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
> index 5d2b7ba94d..835341457d 100644
> --- a/pc-bios/s390-ccw/main.c
> +++ b/pc-bios/s390-ccw/main.c
> @@ -281,7 +281,7 @@ static void probe_boot_device(void)
> sclp_print("Could not find a suitable boot device (none specified)\n");
> }
>
> -int main(void)
> +void main(void)
> {
> sclp_setup();
> css_setup();
> @@ -294,5 +294,4 @@ int main(void)
> }
>
> panic("Failed to load OS from hard disk\n");
> - return 0; /* make compiler happy */
> }
> diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
> index 79db69ff54..b88e0550ab 100644
> --- a/pc-bios/s390-ccw/s390-ccw.h
> +++ b/pc-bios/s390-ccw/s390-ccw.h
> @@ -57,6 +57,7 @@ void write_subsystem_identification(void);
> void write_iplb_location(void);
> extern char stack[PAGE_SIZE * 8] __attribute__((__aligned__(PAGE_SIZE)));
> unsigned int get_loadparm_index(void);
> +void main(void);
Can we keep the forward declaration in the source?