diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-09-28 14:47:40 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-09-28 14:47:40 +0000 |
| commit | 654e7acff28f9c3d6ebecdc5b5fe77dc9e109da0 (patch) | |
| tree | 050efaf16c1945873d7bfc5f1c5e990efbaba35a /patches/grub-0.97 | |
| parent | 485581d204b34397bfa46ec0e4afb632aca1e7b1 (diff) | |
| download | ptxdist-654e7acff28f9c3d6ebecdc5b5fe77dc9e109da0.tar.gz ptxdist-654e7acff28f9c3d6ebecdc5b5fe77dc9e109da0.tar.xz | |
moved local_patches to patches
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7-trunk@3171 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches/grub-0.97')
| -rw-r--r-- | patches/grub-0.97/generic/grub-0.97-gcc4x.diff | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/patches/grub-0.97/generic/grub-0.97-gcc4x.diff b/patches/grub-0.97/generic/grub-0.97-gcc4x.diff new file mode 100644 index 000000000..2be385ae9 --- /dev/null +++ b/patches/grub-0.97/generic/grub-0.97-gcc4x.diff @@ -0,0 +1,33 @@ +# +# Submitted-By: Benedikt Spranger, 2005-09-26 +# Committed-By: Robert Schwebel +# +# Error: +# +# +# +# Description: +# +# GCC 4.x declares non-static declaration and static definition and vice +# versa as error. +# +# State: +# +# unknown +# + +diff -ruN grub-0.97.orig/netboot/main.c grub-0.97/netboot/main.c +--- grub-0.97.orig/netboot/main.c 2004-05-21 00:19:33.000000000 +0200 ++++ grub-0.97/netboot/main.c 2005-09-15 17:33:34.383904479 +0200 +@@ -54,9 +54,9 @@ + + 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 */ |