diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-11-22 15:27:22 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-11-22 15:27:22 +0100 |
| commit | 0dfc14dcb5d96dbe4d8d4412a30216a6673e7199 (patch) | |
| tree | 902472cacfd9f688febfc099768bc3233294f609 /patches/grub-0.97/0001-fix-static-declaration.patch | |
| parent | 51050fdd273f62011b99490ea2b12ffe2159abf7 (diff) | |
| download | ptxdist-0dfc14dcb5d96dbe4d8d4412a30216a6673e7199.tar.gz ptxdist-0dfc14dcb5d96dbe4d8d4412a30216a6673e7199.tar.xz | |
grub: add patches to build with gcc-4.6
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/grub-0.97/0001-fix-static-declaration.patch')
| -rw-r--r-- | patches/grub-0.97/0001-fix-static-declaration.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/patches/grub-0.97/0001-fix-static-declaration.patch b/patches/grub-0.97/0001-fix-static-declaration.patch new file mode 100644 index 000000000..c8d50f373 --- /dev/null +++ b/patches/grub-0.97/0001-fix-static-declaration.patch @@ -0,0 +1,28 @@ +From: Benedikt Spranger <b.spranger@pengutronix.de> +Date: Tue, 22 Nov 2011 15:19:52 +0100 +Subject: [PATCH] fix static declaration + +GCC 4.x declares non-static declaration and static definition and vice +versa as error. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> +--- + netboot/main.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/netboot/main.c b/netboot/main.c +index 82759b6..abd9212 100644 +--- a/netboot/main.c ++++ b/netboot/main.c +@@ -54,9 +54,9 @@ struct rom_info rom; + + static int vendorext_isvalid; + static unsigned long netmask; +-static struct bootpd_t bootp_data; ++struct bootpd_t bootp_data; + static unsigned long xid; +-static unsigned char *end_of_rfc1533 = NULL; ++unsigned char *end_of_rfc1533 = NULL; + + #ifndef NO_DHCP_SUPPORT + #endif /* NO_DHCP_SUPPORT */ |