From 1e11598ae2d2116a5e0347a9e89ed53d46705ebb Mon Sep 17 00:00:00 2001
From: Mark Eichin <eichin@mit.edu>
Date: Tue, 9 Aug 1994 19:34:02 +0000
Subject: [PATCH] string/strings fixes

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4095 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/appl/popper/pop_enter.c          | 4 ++++
 src/appl/popper/pop_get_command.c    | 6 +++++-
 src/appl/popper/pop_get_subcommand.c | 6 +++++-
 src/appl/popper/pop_pass.c           | 6 +++++-
 src/appl/popper/pop_send.c           | 6 +++++-
 src/appl/popper/pop_updt.c           | 6 +++++-
 src/appl/popper/pop_user.c           | 6 +++++-
 7 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/appl/popper/pop_enter.c b/src/appl/popper/pop_enter.c
index c78656b63..5bc69bad3 100644
--- a/src/appl/popper/pop_enter.c
+++ b/src/appl/popper/pop_enter.c
@@ -6,7 +6,11 @@
 #include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
+#else
+#include <string.h>
+#endif
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <mit-copyright.h>
diff --git a/src/appl/popper/pop_get_command.c b/src/appl/popper/pop_get_command.c
index ba13a42e3..ebe962d82 100644
--- a/src/appl/popper/pop_get_command.c
+++ b/src/appl/popper/pop_get_command.c
@@ -7,11 +7,15 @@
 #ifndef lint
 static char copyright[] = "Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n";
 static char SccsId[] = "@(#)pop_get_command.c	2.1  3/18/91";
-#endif not lint
+#endif
 
 #include <stdio.h>
 #include <sys/types.h>
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
+#else
+#include <string.h>
+#endif
 #include "popper.h"
 
 /* 
diff --git a/src/appl/popper/pop_get_subcommand.c b/src/appl/popper/pop_get_subcommand.c
index b79c9aeaa..508d3a39c 100644
--- a/src/appl/popper/pop_get_subcommand.c
+++ b/src/appl/popper/pop_get_subcommand.c
@@ -7,11 +7,15 @@
 #ifndef lint
 static char copyright[] = "Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n";
 static char SccsId[] = "@(#)pop_get_subcommand.c	2.1  3/18/91";
-#endif not lint
+#endif
 
 #include <stdio.h>
 #include <sys/types.h>
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
+#else
+#include <string.h>
+#endif
 #include "popper.h"
 
 /* 
diff --git a/src/appl/popper/pop_pass.c b/src/appl/popper/pop_pass.c
index b2cc3b2b6..3364a633f 100644
--- a/src/appl/popper/pop_pass.c
+++ b/src/appl/popper/pop_pass.c
@@ -7,11 +7,15 @@
 #ifndef lint
 static char copyright[] = "Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n";
 static char SccsId[] = "@(#)pop_pass.c	2.3  4/2/91";
-#endif not lint
+#endif
 
 #include <stdio.h>
 #include <sys/types.h>
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
+#else
+#include <string.h>
+#endif
 #include <pwd.h>
 #include "popper.h"
 
diff --git a/src/appl/popper/pop_send.c b/src/appl/popper/pop_send.c
index c356a610c..bcfb10cb2 100644
--- a/src/appl/popper/pop_send.c
+++ b/src/appl/popper/pop_send.c
@@ -7,11 +7,15 @@
 #ifndef lint
 static char copyright[] = "Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n";
 static char SccsId[] = "@(#)pop_send.c	2.1  3/18/91";
-#endif not lint
+#endif
 
 #include <stdio.h>
 #include <sys/types.h>
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
+#else
+#include <string.h>
+#endif
 #include "popper.h"
 
 /* 
diff --git a/src/appl/popper/pop_updt.c b/src/appl/popper/pop_updt.c
index 38cbdaf28..f10730ac7 100644
--- a/src/appl/popper/pop_updt.c
+++ b/src/appl/popper/pop_updt.c
@@ -7,7 +7,7 @@
 #ifndef lint
 static char copyright[] = "Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n";
 static char SccsId[] = "@(#)pop_updt.c	2.3  3/20/91";
-#endif not lint
+#endif
 
 #include <errno.h>
 #include <stdio.h>
@@ -18,7 +18,11 @@ static char SccsId[] = "@(#)pop_updt.c	2.3  3/20/91";
 #include <fcntl.h>
 #endif
 #include <sys/types.h>
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
+#else
+#include <string.h>
+#endif
 #include <sys/stat.h>
 #include <sys/file.h>
 #include "popper.h"
diff --git a/src/appl/popper/pop_user.c b/src/appl/popper/pop_user.c
index 6559e6a98..26b9260ab 100644
--- a/src/appl/popper/pop_user.c
+++ b/src/appl/popper/pop_user.c
@@ -7,11 +7,15 @@
 #ifndef lint
 static char copyright[] = "Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n";
 static char SccsId[] = "@(#)pop_user.c	2.1  3/18/91";
-#endif not lint
+#endif
 
 #include <stdio.h>
 #include <sys/types.h>
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
+#else
+#include <string.h>
+#endif
 #include "popper.h"
 
 #ifdef KERBEROS
-- 
2.26.2