aboutsummaryrefslogtreecommitdiff
path: root/src/include/ipxe/ip.h
diff options
context:
space:
mode:
authorPiotr Jaroszyński <p.jaroszynski@gmail.com>2010-08-19 23:39:17 +0200
committerMichael Brown <mcb30@ipxe.org>2010-08-20 10:13:04 +0100
commitb9eaf24df211591793bfe151169a23ab1567bdf9 (patch)
tree0d08906e0754715c4eaeb1322459baecb050eeeb /src/include/ipxe/ip.h
parent49d6f5700561be091b2b25bb7641708333e4911d (diff)
downloadipxe-b9eaf24df211591793bfe151169a23ab1567bdf9.zip
ipxe-b9eaf24df211591793bfe151169a23ab1567bdf9.tar.gz
ipxe-b9eaf24df211591793bfe151169a23ab1567bdf9.tar.bz2
[build] Fix misaligned table entries when using gcc 4.5
Declarations without the accompanying __table_entry cause misalignment of the table entries when using gcc 4.5. Fix by adding the appropriate __table_entry macro or (where possible) by removing unnecessary forward declarations. Signed-off-by: Piotr Jaroszyński <p.jaroszynski@gmail.com> Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/include/ipxe/ip.h')
-rw-r--r--src/include/ipxe/ip.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/include/ipxe/ip.h b/src/include/ipxe/ip.h
index e3445aa..3f3dc1f 100644
--- a/src/include/ipxe/ip.h
+++ b/src/include/ipxe/ip.h
@@ -13,10 +13,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <ipxe/in.h>
#include <ipxe/list.h>
#include <ipxe/retry.h>
+#include <ipxe/netdevice.h>
struct io_buffer;
-struct net_device;
-struct net_protocol;
/* IP constants */
@@ -92,6 +91,6 @@ struct frag_buffer {
extern struct list_head ipv4_miniroutes;
-extern struct net_protocol ipv4_protocol;
+extern struct net_protocol ipv4_protocol __net_protocol;
#endif /* _IPXE_IP_H */