From 05b284399eedf50b360d7d70e821162c8ac79f3f Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 23 Mar 2006 20:34:08 +0000 Subject: [PATCH] Moved old tcp.h to old_tcp.h, to avoid name clash with new (uIP-based) tcp.h. --- src/include/etherboot.h | 2 +- src/include/{tcp.h => old_tcp.h} | 0 src/proto/http.c | 2 +- src/proto/tftpcore.c | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename src/include/{tcp.h => old_tcp.h} (100%) diff --git a/src/include/etherboot.h b/src/include/etherboot.h index d8fcc98c..6ce55c10 100644 --- 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 4fa594f6..3264f2ad 100644 --- 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 511c6859..c7673bdb 100644 --- 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"