summaryrefslogtreecommitdiffstats
path: root/patches/grub-0.97/generic/grub-0.97-gcc4x.diff
diff options
context:
space:
mode:
Diffstat (limited to 'patches/grub-0.97/generic/grub-0.97-gcc4x.diff')
-rw-r--r--patches/grub-0.97/generic/grub-0.97-gcc4x.diff33
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 */