Browse Source

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

tcp.h.
tags/v0.9.3
Michael Brown 18 years ago
parent
commit
05b284399e
4 changed files with 3 additions and 3 deletions
  1. 1
    1
      src/include/etherboot.h
  2. 0
    0
      src/include/old_tcp.h
  3. 1
    1
      src/proto/http.c
  4. 1
    1
      src/proto/tftpcore.c

+ 1
- 1
src/include/etherboot.h View File

@@ -147,7 +147,7 @@ enum {
147 147
 #include	"if_arp.h"
148 148
 #include	"ip.h"
149 149
 #include	"udp.h"
150
-#include	"tcp.h"
150
+#include	"old_tcp.h"
151 151
 #include	"bootp.h"
152 152
 #include	"igmp.h"
153 153
 #include	"nfs.h"

src/include/tcp.h → src/include/old_tcp.h View File


+ 1
- 1
src/proto/http.c View File

@@ -1,5 +1,5 @@
1 1
 #include "proto.h"
2
-#include "tcp.h"
2
+#include "old_tcp.h"
3 3
 #include "url.h"
4 4
 #include "etherboot.h"
5 5
 

+ 1
- 1
src/proto/tftpcore.c View File

@@ -1,5 +1,5 @@
1 1
 #include "tftp.h"
2
-#include "tcp.h" /* for struct tcphdr */
2
+#include "old_tcp.h" /* for struct tcphdr */
3 3
 #include "errno.h"
4 4
 #include "etherboot.h"
5 5
 #include "tftpcore.h"

Loading…
Cancel
Save