From ce2fa3a119b8c6558697ad797542cbed40377206 Mon Sep 17 00:00:00 2001
From: Nick Briggs <nicholas.h.briggs@gmail.com>
Date: Thu, 25 May 2017 15:48:08 -0700
Subject: [PATCH] Cleanup warnings for missing/wrong include files

---
 src/dbgtool.c  | 1 +
 src/dir.c      | 6 ++++--
 src/keymaker.c | 1 +
 src/rpc.c      | 1 +
 src/uutils.c   | 2 +-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/dbgtool.c b/src/dbgtool.c
index 6212eb1..e294a38 100755
--- a/src/dbgtool.c
+++ b/src/dbgtool.c
@@ -33,6 +33,7 @@ static char *id = "$Id: dbgtool.c,v 1.4 2001/12/24 01:09:00 sybalsky Exp $ Copyr
 */
 /***************************************************************/
 #include <stdio.h>
+#include <string.h>
 #include  <setjmp.h>
 #include "lispemul.h"
 #include "lispmap.h"
diff --git a/src/dir.c b/src/dir.c
index 8d2317b..3d32183 100755
--- a/src/dir.c
+++ b/src/dir.c
@@ -24,7 +24,9 @@ static char *id = "$Id: dir.c,v 1.4 2001/12/26 22:17:01 sybalsky Exp $ Copyright
 #ifndef DOS
 #include	<sys/param.h>
 #ifndef OS5
+#ifndef FREEBSD
 #include	<sys/dir.h>
+#endif /* FREEBSD */
 #endif /* OS5 */
 #include	<sys/stat.h>
 #include	<setjmp.h>
@@ -36,7 +38,7 @@ static char *id = "$Id: dir.c,v 1.4 2001/12/26 22:17:01 sybalsky Exp $ Copyright
 /*  #include <string.h> */
 #endif /* SYSVONLY */
 
-#ifdef LINUX
+#if defined(LINUX) || defined(MACOSX) || defined(FREEBSD)
 #include <string.h>
 #endif /* LINUX */
 
@@ -75,7 +77,7 @@ static char *id = "$Id: dir.c,v 1.4 2001/12/26 22:17:01 sybalsky Exp $ Copyright
 #include <unistd.h>
 #endif /* SYSVONLY */
 
-#ifdef OS5
+#if defined(OS5) || defined(FREEBSD)
 #include <dirent.h>
 #define direct dirent
 #endif
diff --git a/src/keymaker.c b/src/keymaker.c
index 09c68ab..1a32cd9 100755
--- a/src/keymaker.c
+++ b/src/keymaker.c
@@ -31,6 +31,7 @@ static char *id = "$Id: keymaker.c,v 1.3 1999/05/31 23:35:35 sybalsky Exp $ Copy
    ===================================================================== */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
diff --git a/src/rpc.c b/src/rpc.c
index 8ea63c9..cfd0990 100755
--- a/src/rpc.c
+++ b/src/rpc.c
@@ -39,6 +39,7 @@ static char *id = "$Id: rpc.c,v 1.3 2001/12/24 01:09:06 sybalsky Exp $ Copyright
 #include <netdb.h>
 #include <errno.h>
 #include <sys/ioctl.h>
+#include <string.h>	/* for memset/memcpy */
 #endif /* DOS */
 #include "lispemul.h"
 #include "lispmap.h"
diff --git a/src/uutils.c b/src/uutils.c
index 62efef6..28b5f51 100755
--- a/src/uutils.c
+++ b/src/uutils.c
@@ -37,7 +37,7 @@ static char *id = "$Id: uutils.c,v 1.3 1999/05/31 23:35:47 sybalsky Exp $ Copyri
 #include <sys/time.h>
 #endif
 #ifndef SYSVONLY
-#ifdef DOS
+#if defined(DOS) || defined(MACOSX) || defined(FREEBSD)
 #include <string.h>
 #else
 #include <strings.h>