Make net/netdude compiling on -current again.

PR:		ports/45538
Submitted by:	Paul Everlund <tdv94ped@cs.umu.se>
This commit is contained in:
Edwin Groothuis 2002-11-24 09:52:50 +00:00
parent b681982d04
commit 95984d4c26
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=70980
20 changed files with 33 additions and 50 deletions

View File

@ -1,10 +0,0 @@
--- protocols/arp/nd_arp.h.orig Sat Oct 12 00:17:24 2002
+++ protocols/arp/nd_arp.h Sat Oct 12 00:17:38 2002
@@ -26,6 +26,7 @@
#ifndef __nd_arp_h
#define __nd_arp_h
+#include <sys/socket.h>
#include <net/ethernet.h>
#include <net/if_arp.h>

View File

@ -1,11 +0,0 @@
--- protocols/fddi/nd_fddi.h.orig Sat Oct 12 00:25:59 2002
+++ protocols/fddi/nd_fddi.h Sat Oct 12 00:26:10 2002
@@ -26,7 +26,7 @@
#ifndef __nd_fddi_h
#define __nd_fddi_h
-#include <netinet/if_fddi.h>
+#include <net/fddi.h>
#include <netdude/nd_gettext.h>
#include <netdude/nd_packet.h>

View File

@ -1,29 +0,0 @@
--- protocols/fddi/nd_fddi_callbacks.c.orig Sat Oct 12 00:29:27 2002
+++ protocols/fddi/nd_fddi_callbacks.c Sat Oct 12 00:33:10 2002
@@ -22,8 +22,6 @@
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <netinet/if_fddi.h>
-
#include <netdude/nd_debug.h>
#include <netdude/nd_macros.h>
#include <netdude/nd_gui.h>
@@ -73,7 +71,7 @@
if (!fh)
continue;
- memcpy(fh->fddi_dhost, address, FDDI_K_ALEN);
+ memcpy(fh->fddi_dhost, address, FDDI_ADDR_LEN);
nd_packet_modified_at_index(nd_pit_get(&pit), nd_pit_get_index(&pit));
}
@@ -119,7 +117,7 @@
if (!fh)
continue;
- memcpy(fh->fddi_shost, address, FDDI_K_ALEN);
+ memcpy(fh->fddi_shost, address, FDDI_ADDR_LEN);
nd_packet_modified_at_index(nd_pit_get(&pit), nd_pit_get_index(&pit));
}

View File

@ -0,0 +1,11 @@
--- protocols/arp/nd_arp.h.orig Wed Nov 20 20:57:00 2002
+++ protocols/arp/nd_arp.h Wed Nov 20 20:57:26 2002
@@ -26,6 +26,8 @@
#ifndef __nd_arp_h
#define __nd_arp_h
+#include <sys/types.h>
+#include <sys/socket.h>
#include <net/ethernet.h>
#include <net/if_arp.h>

View File

@ -0,0 +1,12 @@
--- protocols/fddi/nd_fddi_callbacks.c.orig Wed Nov 20 21:37:07 2002
+++ protocols/fddi/nd_fddi_callbacks.c Wed Nov 20 21:38:04 2002
@@ -22,7 +22,9 @@
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <sys/types.h>
#include <netinet/if_fddi.h>
+#define FDDI_K_ALEN 6
#include <netdude/nd_debug.h>
#include <netdude/nd_macros.h>

View File

@ -0,0 +1,10 @@
--- src/nd_protocol.c.orig Wed Nov 20 20:13:36 2002
+++ src/nd_protocol.c Wed Nov 20 20:14:20 2002
@@ -26,6 +26,7 @@
# include <config.h>
#endif
+#include <sys/types.h>
#include <netinet/in.h>
#include <netdude/nd.h>