summaryrefslogtreecommitdiffstats
path: root/src/proto
diff options
context:
space:
mode:
authorMichael Brown2006-03-23 21:34:08 +0100
committerMichael Brown2006-03-23 21:34:08 +0100
commit05b284399eedf50b360d7d70e821162c8ac79f3f (patch)
tree8705d17b5e569a8ff88b17958e161a9a946992f2 /src/proto
parentAssertions are now handled via the POSIX-like <assert.h>. (diff)
downloadipxe-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/proto')
-rw-r--r--src/proto/http.c2
-rw-r--r--src/proto/tftpcore.c2
2 files changed, 2 insertions, 2 deletions
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"