From abae6e9cd3f041648eaa85fad2f861515b67c1ce Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Thu, 1 Apr 1999 15:33:52 +0000
Subject: [PATCH] First few FreeBSD portability fixes.

---
 sysdep/unix/io.c      | 5 +++++
 tools/Makefile-top.in | 2 +-
 tools/Makefile.in     | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 6e1952e7..9a388442 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -8,6 +8,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -216,6 +217,10 @@ tm_shot(void)
  *	Sockets
  */
 
+#ifndef SOL_IP
+#define SOL_IP IPPROTO_IP
+#endif
+
 static list sock_list;
 
 static void
diff --git a/tools/Makefile-top.in b/tools/Makefile-top.in
index 4493a406..13dc606d 100644
--- a/tools/Makefile-top.in
+++ b/tools/Makefile-top.in
@@ -8,7 +8,7 @@ all depend:
 
 clean:
 	$(MAKE) -C $(objdir) clean
-	rm -f `find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name depend -or -name .#*`
+	find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name depend -or -name .#* | xargs rm -f
 
 distclean: clean
 	rm -rf $(objdir)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index ce649d6b..9895b10c 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -25,7 +25,7 @@ $(exedir)/bird: $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
 	touch .dep-stamp
 
 clean:
-	rm -f `find . -name "*.[oa]" -or -name core -or -name depend`
+	find . -name "*.[oa]" -or -name core -or -name depend | xargs rm -f
 	rm -f $(exedir)/bird .dep-stamp
 
 distclean: clean