diff options
| author | Michael Brown | 2006-03-23 21:34:08 +0100 |
|---|---|---|
| committer | Michael Brown | 2006-03-23 21:34:08 +0100 |
| commit | 05b284399eedf50b360d7d70e821162c8ac79f3f (patch) | |
| tree | 8705d17b5e569a8ff88b17958e161a9a946992f2 /src | |
| parent | Assertions are now handled via the POSIX-like <assert.h>. (diff) | |
| download | ipxe-05b284399eedf50b360d7d70e821162c8ac79f3f.tar.gz ipxe-05b284399eedf50b360d7d70e821162c8ac79f3f.tar.xz ipxe-05b284399eedf50b360d7d70e821162c8ac79f3f.zip | |
Moved old tcp.h to old_tcp.h, to avoid name clash with new (uIP-based)
tcp.h.
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/etherboot.h | 2 | ||||
| -rw-r--r-- | src/include/old_tcp.h (renamed from src/include/tcp.h) | 0 | ||||
| -rw-r--r-- | src/proto/http.c | 2 | ||||
| -rw-r--r-- | src/proto/tftpcore.c | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/src/include/etherboot.h b/src/include/etherboot.h index d8fcc98c2..6ce55c101 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 index 93e1485e8..93e1485e8 100644 --- a/src/include/tcp.h +++ b/src/include/old_tcp.h diff --git a/src/proto/http.c b/src/proto/http.c index 4fa594f66..3264f2ad9 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 511c68599..c7673bdbf 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" |