Moved old tcp.h to old_tcp.h, to avoid name clash with new (uIP-based)

tcp.h.

diff --git a/src/include/etherboot.h b/src/include/etherboot.h
index d8fcc98c26a45a557376ca781fde199986fdbd2c..6ce55c1017296b43dfeb26b508e91a60f37bde03 100644 (file)
--- a/src/include/etherboot.h
+++ b/src/include/etherboot.h
@@ -147,7 +147,7 @@ enum {
 #include       "if_arp.h"
 #include       "ip.h"
 #include       "udp.h"
-#include       "tcp.h"
+#include       "old_tcp.h"
 #include       "bootp.h"
 #include       "igmp.h"
 #include       "nfs.h"

diff --git a/src/include/tcp.h b/src/include/old_tcp.h
similarity index 100%
rename from src/include/tcp.h
rename to src/include/old_tcp.h

diff --git a/src/proto/http.c b/src/proto/http.c
index 4fa594f66cac7ba54f410d77acbeb47439430d08..3264f2ad99da6c8a53fbdd196614b9f06580bae7 100644 (file)
--- a/src/proto/http.c
+++ b/src/proto/http.c
@@ -1,5 +1,5 @@
 #include "proto.h"
-#include "tcp.h"
+#include "old_tcp.h"
 #include "url.h"
 #include "etherboot.h"
 

diff --git a/src/proto/tftpcore.c b/src/proto/tftpcore.c
index 511c68599615b761f37c7a968c5cccd60ef8090d..c7673bdbff303fef7745b46dfe881d227e535512 100644 (file)
--- a/src/proto/tftpcore.c
+++ b/src/proto/tftpcore.c
@@ -1,5 +1,5 @@
 #include "tftp.h"
-#include "tcp.h" /* for struct tcphdr */
+#include "old_tcp.h" /* for struct tcphdr */
 #include "errno.h"
 #include "etherboot.h"
 #include "tftpcore.h"