string/strings fixes

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4093 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/popper/configure.in b/src/appl/popper/configure.in
index f9eab3f27f3a5e915886c18da3803a3da4d115bc..fb586298303713b9b20de88284da29d10ac421a4 100644 (file)
--- a/src/appl/popper/configure.in
+++ b/src/appl/popper/configure.in
@@ -15,6 +15,7 @@ AC_COMPILE_CHECK([POSIX file locking -- structs and flags],
 [struct flock f; 1+F_SETLK;], 
 AC_DEFINE(POSIX_FILE_LOCKS)))
 
+AC_HAVE_HEADERS(strings.h)
 AC_HEADER_CHECK(unistd.h,AC_DEFINE(HAS_UNISTD_H))
 AC_HEADER_CHECK(paths.h,AC_DEFINE(HAS_PATHS_H))
 

diff --git a/src/appl/popper/pop_dropcopy.c b/src/appl/popper/pop_dropcopy.c
index 0acb16d67d541e3b138d12b52230d02567bd6f87..6c93f77f2eb7d1e21e4f88edb2c009cd0eaefeb4 100644 (file)
--- a/src/appl/popper/pop_dropcopy.c
+++ b/src/appl/popper/pop_dropcopy.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_dropcopy.c     2.6  4/3/91";
-#endif not lint
+#endif
 
 #include <errno.h>
 #include <stdio.h>
@@ -18,7 +18,11 @@ static char SccsId[] = "@(#)pop_dropcopy.c   2.6  4/3/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 <pwd.h>

diff --git a/src/appl/popper/pop_dropinfo.c b/src/appl/popper/pop_dropinfo.c
index 827f282e678f5c83f91d795be32e31b981ef8998..c46da13e47102454d6936b03a0217d9d13af6068 100644 (file)
--- a/src/appl/popper/pop_dropinfo.c
+++ b/src/appl/popper/pop_dropinfo.c
@@ -7,12 +7,16 @@
 #ifndef lint
 static char copyright[] = "Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n";
 static char SccsId[] = "@(#)pop_dropinfo.c     2.1  3/18/91";
-#endif not lint
+#endif
 
 #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 "popper.h"

diff --git a/src/appl/popper/pop_msg.c b/src/appl/popper/pop_msg.c
index 839cb39bf5e49c88677820d409455167923521ba..14ff52f1029c2ea628c65c9df7306c6cd8115e8d 100644 (file)
--- a/src/appl/popper/pop_msg.c
+++ b/src/appl/popper/pop_msg.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_msg.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 <varargs.h>
 #include "popper.h"