Moved old tcp.h to old_tcp.h, to avoid name clash with new (uIP-based)
authorMichael Brown <mcb30@etherboot.org>
Thu, 23 Mar 2006 20:34:08 +0000 (20:34 +0000)
committerMichael Brown <mcb30@etherboot.org>
Thu, 23 Mar 2006 20:34:08 +0000 (20:34 +0000)
tcp.h.

src/include/etherboot.h
src/include/old_tcp.h [moved from src/include/tcp.h with 100% similarity]
src/proto/http.c
src/proto/tftpcore.c

index d8fcc98..6ce55c1 100644 (file)
@@ -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"
similarity index 100%
rename from src/include/tcp.h
rename to src/include/old_tcp.h
index 4fa594f..3264f2a 100644 (file)
@@ -1,5 +1,5 @@
 #include "proto.h"
-#include "tcp.h"
+#include "old_tcp.h"
 #include "url.h"
 #include "etherboot.h"
 
index 511c685..c7673bd 100644 (file)
@@ -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"