STABLE14-openafs-string-header-cleanup-20071030

fix up string headers for consistency

(cherry picked from commit 7d05bd439e144aa3bc5fd68908d1a359182897b0)

diff --git a/src/afsd/vsys.c b/src/afsd/vsys.c
index 424eb1b3c2bc4198845f091f3c709341dd11da5a..a36b5cdd0305fc8127daec04ed44ce8bf67097c3 100644 (file)
--- a/src/afsd/vsys.c
+++ b/src/afsd/vsys.c
@@ -12,13 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/afsmonitor/afsmon-output.c b/src/afsmonitor/afsmon-output.c
index 15b3caf85c307e75aca9b9733793cb1356e08132..c3403c7f5633a9c506c2920940b89ea9fb5262f8 100644 (file)
--- a/src/afsmonitor/afsmon-output.c
+++ b/src/afsmonitor/afsmon-output.c
@@ -19,14 +19,7 @@
 #include <time.h>
 #include <afsconfig.h>
 #include <afs/param.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 RCSID
     ("$Header$");

diff --git a/src/afsmonitor/afsmon-win.c b/src/afsmonitor/afsmon-win.c
index e54d17f5cc4125ed8193d5025265313b156a38f3..6a564b41c6ce8552bc7a12dd54c26670d6493efb 100644 (file)
--- a/src/afsmonitor/afsmon-win.c
+++ b/src/afsmonitor/afsmon-win.c
@@ -22,9 +22,7 @@ RCSID
 #include <signal.h>
 #include <math.h>
 #include <cmd.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 #undef IN
 #include <time.h>
 

diff --git a/src/aklog/asetkey.c b/src/aklog/asetkey.c
index 4cf551414448b47b114c65682c87cbcc31b05a9d..40b6708818a7093d0af34ab103ccc762d7b82d9d 100644 (file)
--- a/src/aklog/asetkey.c
+++ b/src/aklog/asetkey.c
@@ -14,19 +14,11 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
 #ifdef HAVE_MEMORY_H
 #include <memory.h>
 #endif /* HAVE_MEMORY_H */
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else /* HAVE_STRING_H */
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif /* HAVE_STRINGS_H */
-#endif /* HAVE_STRING_H */
 
 #include <afs/stds.h>
 #include <krb5.h>

diff --git a/src/auth/authcon.c b/src/auth/authcon.c
index aff1106a8fc70571b087a3334de6e3fe995d9a32..c57abeec35e6d7e15f423dff8a6fce88e84b8fb3 100644 (file)
--- a/src/auth/authcon.c
+++ b/src/auth/authcon.c
@@ -41,6 +41,7 @@ RCSID
 #include <netinet/in.h>
 #include <netdb.h>
 #endif
+#include <string.h>
 #include <des.h>
 #include <rx/rxkad.h>
 #include <rx/rx.h>

diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c
index ad7134eb08757800d8c9e6b40d6ad79cd69d8a2a..436b58498ee47de964f737f79280c6b7b539e4a8 100644 (file)
--- a/src/auth/cellconfig.c
+++ b/src/auth/cellconfig.c
@@ -47,13 +47,7 @@ RCSID
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/auth/copyauth.c b/src/auth/copyauth.c
index 96a5e59c370d82022a0cbe1485096884477bc55d..e1a592d8e1ece0aa3bad3a88fd37f6272f4ed9d7 100644 (file)
--- a/src/auth/copyauth.c
+++ b/src/auth/copyauth.c
@@ -13,14 +13,7 @@
 RCSID
     ("$Header$");
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include <sys/types.h>
 #include "auth.h"
 #ifdef AFS_NT40_ENV

diff --git a/src/auth/ktc.c b/src/auth/ktc.c
index 15776210e7accd4020a48aa21cf194b9d38399e5..bf181359dbe169c74fa896e2eca692eefb290442 100644 (file)
--- a/src/auth/ktc.c
+++ b/src/auth/ktc.c
@@ -49,13 +49,7 @@ RCSID
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <netinet/in.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <afs/vice.h>
 #ifdef AFS_AIX_ENV
 #include <sys/lockf.h>

diff --git a/src/auth/setkey.c b/src/auth/setkey.c
index edefbd6036ee2721f55aa0802d964ce2440c9169..299928145bb0d985ff72dddce03afc70d8eb488d 100644 (file)
--- a/src/auth/setkey.c
+++ b/src/auth/setkey.c
@@ -21,13 +21,7 @@ RCSID
 #include <WINNT/afsreg.h>
 #include <WINNT/afsevent.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif

diff --git a/src/auth/writeconfig.c b/src/auth/writeconfig.c
index 5116f32f5ffe43811bb68e51b513b67820fb7ef5..a3577de59789956bc8ede49456387b0214245f4e 100644 (file)
--- a/src/auth/writeconfig.c
+++ b/src/auth/writeconfig.c
@@ -28,13 +28,7 @@ RCSID
 #endif
 #include <stdio.h>
 #include <errno.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif

diff --git a/src/bozo/bnode.c b/src/bozo/bnode.c
index 0ebdfb3d5378ae50c3f8815f3dccd4161de5f43c..f6facc31a1b27647e6d2e62ccca1edf94e6dff91 100644 (file)
--- a/src/bozo/bnode.c
+++ b/src/bozo/bnode.c
@@ -28,14 +28,7 @@ RCSID
 #include <time.h>
 #endif
 #include <sys/stat.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include <afs/procmgmt.h>      /* signal(), kill(), wait(), etc. */
 #include <lwp.h>

diff --git a/src/bozo/bos_util.c b/src/bozo/bos_util.c
index b6e992fe94b270e4dde0a4b7d77ff641d6ad29b9..c29b79790f5e6ff25fffeac9c9a66b0b3db4f932 100644 (file)
--- a/src/bozo/bos_util.c
+++ b/src/bozo/bos_util.c
@@ -28,14 +28,7 @@ RCSID
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <netdb.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include <afs/stds.h>
 #include <afs/afsutil.h>

diff --git a/src/bozo/bosoprocs.c b/src/bozo/bosoprocs.c
index 9d368cac1a2e50f0baa1dd82f2560345c5845b20..a9b1b294d854dd2053729e2dbf42c6541b95f5cd 100644 (file)
--- a/src/bozo/bosoprocs.c
+++ b/src/bozo/bosoprocs.c
@@ -37,14 +37,7 @@ RCSID
 #include <afs/fileutil.h>
 #include <afs/ktime.h>
 #include <afs/audit.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include "bnode.h"
 #include "bosint.h"

diff --git a/src/bozo/cronbnodeops.c b/src/bozo/cronbnodeops.c
index 7fecb2c4f0c4d5b9051aed6540fab3fb1cda8243..6657cd2f52892752e81ec712b238c5e7f1fa9282 100644 (file)
--- a/src/bozo/cronbnodeops.c
+++ b/src/bozo/cronbnodeops.c
@@ -23,13 +23,7 @@ RCSID
 #include <io.h>
 #endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <stdlib.h>
 
 #include <afs/ktime.h>

diff --git a/src/bozo/ezbnodeops.c b/src/bozo/ezbnodeops.c
index 7852d9cbd2f4b77251a0c6d51a3f4abc34b8297b..b55ab1e7b74da4d26ed9afa202585093b1514280 100644 (file)
--- a/src/bozo/ezbnodeops.c
+++ b/src/bozo/ezbnodeops.c
@@ -21,13 +21,7 @@ RCSID
 #include <io.h>
 #endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <stdlib.h>
 
 #include <afs/afsutil.h>

diff --git a/src/bozo/fsbnodeops.c b/src/bozo/fsbnodeops.c
index 2ac65e46210cdae8c388fc99e6d98e172176a2df..e688b4d8cde73cf2bd5960c18e353d1de492f4b9 100644 (file)
--- a/src/bozo/fsbnodeops.c
+++ b/src/bozo/fsbnodeops.c
@@ -26,13 +26,7 @@ RCSID
 #else
 #include <sys/file.h>
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <stdlib.h>
 
 #endif /* AFS_NT40_ENV */

diff --git a/src/bucoord/bc.p.h b/src/bucoord/bc.p.h
index 4e385e238d440924c04807a7c473b9ccdb6e52fe..4fbc1bfc6105f9c298ddc1129a41425e2bdb517b 100644 (file)
--- a/src/bucoord/bc.p.h
+++ b/src/bucoord/bc.p.h
@@ -13,11 +13,8 @@
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
 #endif /* HAVE_STDIO_H */
-#if defined(HAVE_STRING_H)
-# include <string.h>
-#elif defined(HAVE_STRINGS_H)
-# include <strings.h>
-#endif /* HAVE_STRING_H */
+
+#include <string.h>
 
 /*
  * Represents a host in the config database.

diff --git a/src/budb/database.c b/src/budb/database.c
index aa6216a001d2c2c3fb13acdb1a107f709da7e5b6..fa64aa2701b0bb7e76c160882741cdbcb45a5a7a 100644 (file)
--- a/src/budb/database.c
+++ b/src/budb/database.c
@@ -27,15 +27,7 @@ RCSID
 #include "database.h"
 #include "error_macros.h"
 #include "afs/audit.h"
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 
 int pollCount;
 struct memoryDB db;            /* really allocate it here */

diff --git a/src/budb/db_alloc.c b/src/budb/db_alloc.c
index cbdb79698947a59eb06e7882bfa06ab911c2225d..c1bce25e4979f9a42c973806d838c9c3808b8f1b 100644 (file)
--- a/src/budb/db_alloc.c
+++ b/src/budb/db_alloc.c
@@ -18,13 +18,7 @@ RCSID
 #else
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <sys/types.h>
 #include <afs/stds.h>
 #include <ubik.h>

diff --git a/src/budb/db_dump.c b/src/budb/db_dump.c
index 587fde42c7e7cd32d000370fbfcef5c9f4b05d7c..8c5a61446afdf5394d18605108b636d8658ffea6 100644 (file)
--- a/src/budb/db_dump.c
+++ b/src/budb/db_dump.c
@@ -28,14 +28,7 @@ RCSID
 #include <sys/types.h>
 #include <ubik.h>
 #include <lock.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include "database.h"
 #include "budb.h"

diff --git a/src/budb/db_hash.c b/src/budb/db_hash.c
index 3ebdd7f2ccf54683a1cfeca75ece4eec1731f5f1..0b61267ca6ab6c6d049b672cdf345bc9e72fc393 100644 (file)
--- a/src/budb/db_hash.c
+++ b/src/budb/db_hash.c
@@ -18,13 +18,7 @@ RCSID
 #else
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <sys/types.h>
 #include <afs/stds.h>
 #include <ubik.h>

diff --git a/src/budb/db_text.c b/src/budb/db_text.c
index 0627cc7b3a00b880604e87cd1683fe785ec73e53..9084b4cc60eff2b31d01980b3c3307bf7a58ea18 100644 (file)
--- a/src/budb/db_text.c
+++ b/src/budb/db_text.c
@@ -22,13 +22,7 @@ RCSID
 #include <sys/file.h>
 #include <sys/param.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <sys/types.h>
 #include <ubik.h>
 #include <afs/auth.h>

diff --git a/src/budb/ol_verify.c b/src/budb/ol_verify.c
index 7af32766c2dabc0c32977101e8e953fdf9bc5982..741630ef1baf8ffa09999aa0592af303481ade70 100644 (file)
--- a/src/budb/ol_verify.c
+++ b/src/budb/ol_verify.c
@@ -22,13 +22,7 @@ RCSID
 #include <netinet/in.h>
 #include <netdb.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <afs/stds.h>
 #include <sys/types.h>
 #include <lock.h>

diff --git a/src/budb/procs.c b/src/budb/procs.c
index 9524e1b2aeea7f890aae4f03c89e3e743a7a4bcc..2ad1be005e86ef000facac27d6929916b8821233 100644 (file)
--- a/src/budb/procs.c
+++ b/src/budb/procs.c
@@ -29,14 +29,7 @@ RCSID
 #include <sys/resource.h>
 #endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include <sys/types.h>
 #include <afs/stds.h>
 #include <afs/bubasics.h>

diff --git a/src/budb/server.c b/src/budb/server.c
index 10da9f8b152c88357da74065a3536002b4a007a5..15036770d00731a96f4ad1326229aa3873eadb2f 100644 (file)
--- a/src/budb/server.c
+++ b/src/budb/server.c
@@ -24,15 +24,7 @@ RCSID
 #include <sys/time.h>
 #include <netdb.h>
 #endif
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include <afs/stds.h>
 #include <sys/types.h>
 #include <time.h>

diff --git a/src/butc/dbentries.c b/src/butc/dbentries.c
index 5da1ba1efa25c8bf7a9fb5704d8f460f6af9ee43..13884413ec52354d2e6094b6be2d672077837271 100644 (file)
--- a/src/butc/dbentries.c
+++ b/src/butc/dbentries.c
@@ -24,6 +24,7 @@ RCSID
 #include <netdb.h>
 #endif
 #include <stdlib.h>
+#include <string.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <lwp.h>

diff --git a/src/butc/dump.c b/src/butc/dump.c
index 5f5b95f63d39989e6a4e5c22ee372cbc5d74aff8..56562e4eef56443da7a4501f9fbe92f7f30473de 100644 (file)
--- a/src/butc/dump.c
+++ b/src/butc/dump.c
@@ -24,6 +24,7 @@ RCSID
 #include <netdb.h>
 #endif
 #include <stdlib.h>
+#include <string.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <lwp.h>

diff --git a/src/butc/lwps.c b/src/butc/lwps.c
index 038d5bc7b68b1a4972b9350bfca15f9be0888f6e..df335903792a8ca83162ee9d70e7c245bba5f900 100644 (file)
--- a/src/butc/lwps.c
+++ b/src/butc/lwps.c
@@ -14,6 +14,7 @@ RCSID
     ("$Header$");
 
 #include <sys/types.h>
+#include <string.h>
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
 #include <conio.h>

diff --git a/src/butc/read_tape.c b/src/butc/read_tape.c
index 0f4aee8462d3f516cd424519a8bf700ff895fa29..a99d0be23d7520f35d2f5d60dc86d782a04079e8 100644 (file)
--- a/src/butc/read_tape.c
+++ b/src/butc/read_tape.c
@@ -21,6 +21,7 @@ RCSID
 #include <netinet/in.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <string.h>
 #include <errno.h>
 
 #include <afs/usd.h>

diff --git a/src/butc/recoverDb.c b/src/butc/recoverDb.c
index fe40c8ac516eb9a971694b190d41b46be2aa29fc..dd51fa660db5470eaaa00220540aa3298fc00acf 100644 (file)
--- a/src/butc/recoverDb.c
+++ b/src/butc/recoverDb.c
@@ -24,6 +24,7 @@ RCSID
 #include <strings.h>
 #endif
 #include <sys/types.h>
+#include <string.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <lwp.h>

diff --git a/src/butc/tcprocs.c b/src/butc/tcprocs.c
index d005e6add00c4f132d75543b079bf12c2e5fcc1b..333345a55cdfd289f5d5d3fbc2bb695d246c579e 100644 (file)
--- a/src/butc/tcprocs.c
+++ b/src/butc/tcprocs.c
@@ -27,6 +27,7 @@ RCSID
 #include <rx/rx.h>
 #include <afs/afsint.h>
 #include <stdio.h>
+#include <string.h>
 #include <afs/procmgmt.h>
 #include <afs/assert.h>
 #include <afs/prs_fs.h>

diff --git a/src/butc/tcstatus.c b/src/butc/tcstatus.c
index 79c0c536584a13416b04d43cfc7a228d067d096f..08cbfb9582a2ce62d4cc3f1f2707875f69ea5afd 100644 (file)
--- a/src/butc/tcstatus.c
+++ b/src/butc/tcstatus.c
@@ -24,6 +24,7 @@ RCSID
 #include <strings.h>
 #endif
 #include <stdio.h>
+#include <string.h>
 #include <afs/com_err.h>
 #include <lock.h>
 #include <afs/bubasics.h>

diff --git a/src/butc/tcudbprocs.c b/src/butc/tcudbprocs.c
index 7511694f573151e4ecc41c337f166f51737e2937..3920dd01a9b753ace323dda002849a960d78dd09 100644 (file)
--- a/src/butc/tcudbprocs.c
+++ b/src/butc/tcudbprocs.c
@@ -28,6 +28,7 @@ RCSID
 #include <rx/rx.h>
 #include <afs/afsint.h>
 #include <stdio.h>
+#include <string.h>
 #include <afs/procmgmt.h>
 #include <afs/assert.h>
 #include <afs/prs_fs.h>

diff --git a/src/butm/file_tm.c b/src/butm/file_tm.c
index e6b71ab03e33ca3c47817aba22a92c067e8a5d30..4458aa21cc59ceeb07c2ed9aa93e8944a14f68ef 100644 (file)
--- a/src/butm/file_tm.c
+++ b/src/butm/file_tm.c
@@ -24,6 +24,7 @@ RCSID
 #include <limits.h>
 #include <sys/stat.h>
 #include <stdio.h>
+#include <string.h>
 #include <ctype.h>
 #include <lwp.h>
 #include <afs/com_err.h>

diff --git a/src/config/mc.c b/src/config/mc.c
index 9a75a2c7123daba886f0ef52689f513aacbdcc76..9e451ba0d166b07dd1c20cff8733143060d3c2fd 100644 (file)
--- a/src/config/mc.c
+++ b/src/config/mc.c
@@ -16,9 +16,7 @@
 #include <stdlib.h>
 
 #include <afsconfig.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 
 #define TOK_DONTUSE 1          /* Don't copy if match and this flag is set. */
 struct token {

diff --git a/src/dir/dir.c b/src/dir/dir.c
index cfbf2d3da673a0356f7b8ad2ba3ac938bcef3af7..ec4ad2632293714c286d6044a1241f47445d0e98 100644 (file)
--- a/src/dir/dir.c
+++ b/src/dir/dir.c
@@ -100,13 +100,7 @@ extern void *DNew();
 #include <netinet/in.h>
 #endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #endif /* KERNEL */
 
 afs_int32 DErrno;

diff --git a/src/dir/salvage.c b/src/dir/salvage.c
index f499a057aa94e2ec4b8d2d152e1c5a89a2701c09..4b867e08f001646d1c2a173a246bb237875b3412 100644 (file)
--- a/src/dir/salvage.c
+++ b/src/dir/salvage.c
@@ -23,13 +23,7 @@ RCSID
 #include <netinet/in.h>
 #endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include "dir.h"
 #define printf Log             /* To make it work with volume salvager */

diff --git a/src/fsprobe/fsprobe.c b/src/fsprobe/fsprobe.c
index 863a043e4f8febda824baada0b20f739f6da4e19..f512aeca11583cc17de2c5445c69378f692475a9 100644 (file)
--- a/src/fsprobe/fsprobe.c
+++ b/src/fsprobe/fsprobe.c
@@ -20,13 +20,7 @@ RCSID
     ("$Header$");
 
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include <fsprobe.h>           /*Interface for this module */
 #include <lwp.h>               /*Lightweight process package */

diff --git a/src/fsprobe/fsprobe_test.c b/src/fsprobe/fsprobe_test.c
index bff804d79c854cff46c071c49e88e2ab46f74bdf..5951e041253f7b3b5b8975c5d9a08bf9cab37579 100644 (file)
--- a/src/fsprobe/fsprobe_test.c
+++ b/src/fsprobe/fsprobe_test.c
@@ -19,14 +19,7 @@
 RCSID
     ("$Header$");
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include <fsprobe.h>           /*Interface for fsprobe module */
 
 /*

diff --git a/src/gtx/curseswindows.c b/src/gtx/curseswindows.c
index a1d351b2e97398ab43b986bab47b27c3306588e5..601dc2bb20d1158de79fe92c73599deef220c956 100644 (file)
--- a/src/gtx/curseswindows.c
+++ b/src/gtx/curseswindows.c
@@ -37,14 +37,7 @@ RCSID
 #include <stdio.h>
 #include <sys/time.h>
 #include <errno.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <stdlib.h>
 
 #include "gtxcurseswin.h"      /*Interface definition */

diff --git a/src/gtx/frame.c b/src/gtx/frame.c
index 983226f4bc9f38234ed41961992d796f819ac444..a0b5fc02cad5fed2846ab69eabcd3319fd0e0c43 100644 (file)
--- a/src/gtx/frame.c
+++ b/src/gtx/frame.c
@@ -19,13 +19,7 @@ RCSID
 #endif
 #include <lwp.h>
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <stdlib.h>
 
 #include "gtxobjects.h"

diff --git a/src/gtx/gtxtest.c b/src/gtx/gtxtest.c
index 68877ac70390893d36565cad57eb096bd9b3cb91..5277c01094e24af530a99b780e4f182c6195916f 100644 (file)
--- a/src/gtx/gtxtest.c
+++ b/src/gtx/gtxtest.c
@@ -13,14 +13,7 @@
 RCSID
     ("$Header$");
 
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include "gtxwindows.h"
 #include "gtxobjects.h"

diff --git a/src/gtx/keymap.c b/src/gtx/keymap.c
index e6c010016bdcd8865142131a89530d57179ee3cc..93dedcfc5484459a540aa9f7031d8c73072b05b5 100644 (file)
--- a/src/gtx/keymap.c
+++ b/src/gtx/keymap.c
@@ -13,14 +13,7 @@
 RCSID
     ("$Header$");
 
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <stdlib.h>
 
 #include "gtxkeymap.h"

diff --git a/src/gtx/lightobject.c b/src/gtx/lightobject.c
index 4feaf1a330576f28ddb79df8404238a4e8833c68..db9e6980cf12b27b5616d17bb12d9c8bb9129e0c 100644 (file)
--- a/src/gtx/lightobject.c
+++ b/src/gtx/lightobject.c
@@ -22,17 +22,9 @@ RCSID
 #include "gtxlightobj.h"       /*Interface for this module */
 #include <stdio.h>             /*Standard I/O stuff */
 #include <errno.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <stdlib.h>
 
-
 /*Externally-advertised array of light onode operations*/
 struct onodeops gator_light_ops = {
     gator_light_destroy,

diff --git a/src/gtx/objects.c b/src/gtx/objects.c
index 1ca8facb9c1a49023ab6de5cadccffd7993d95b8..86299701a157a0877da0a8487e3b91c4049deab3 100644 (file)
--- a/src/gtx/objects.c
+++ b/src/gtx/objects.c
@@ -26,14 +26,7 @@ RCSID
 #include <stdio.h>             /*Standard I/O stuff */
 #include <errno.h>
 
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <stdlib.h>
 
 /*

diff --git a/src/gtx/textcb.c b/src/gtx/textcb.c
index 5bc5d6545a6d25ea56ce218e2c4d7cfaa1de504a..3b095e687ad351239c008127397e7adee9f3156f 100644 (file)
--- a/src/gtx/textcb.c
+++ b/src/gtx/textcb.c
@@ -22,14 +22,7 @@ RCSID
 #include "gtxtextcb.h"         /*Module interface */
 #include <stdio.h>             /*Standard I/O stuff */
 #include <errno.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <stdlib.h>
 
 static int gator_textcb_debug; /*Is debugging output turned on? */

diff --git a/src/gtx/textobject.c b/src/gtx/textobject.c
index 5c7bc33d53f84c4d530aec328e13aad4e88bfd90..9cdd08b7804c6051c4f643c7da010e45bae674b4 100644 (file)
--- a/src/gtx/textobject.c
+++ b/src/gtx/textobject.c
@@ -25,14 +25,7 @@ RCSID
 #include "gtxX11win.h"         /*Gator X11 window interface */
 #include <stdio.h>             /*Standard I/O stuff */
 #include <errno.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <stdlib.h>
 
 /*Externally-advertised array of text onode operations*/

diff --git a/src/kauth/authclient.c b/src/kauth/authclient.c
index 86d7b1f7ee6c736a99d442e91781a10da1591ab7..9d999663770566fb8221654db6874c08fb9b5831 100644 (file)
--- a/src/kauth/authclient.c
+++ b/src/kauth/authclient.c
@@ -46,13 +46,7 @@ RCSID
 #include <sys/socket.h>
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <rx/rxkad.h>
 #include <afs/cellconfig.h>
 #include <ubik.h>

diff --git a/src/kauth/client.c b/src/kauth/client.c
index 6c0a180aac8fe2adc1ee79a1b03b297279121c8b..eea34eab9b9d854f65578351bfdd71e08d7d07f6 100644 (file)
--- a/src/kauth/client.c
+++ b/src/kauth/client.c
@@ -41,13 +41,7 @@ RCSID
 #include <winsock2.h>
 #include <crypt.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef HAVE_UNISTD_H
 #define __USE_XOPEN
 #include <unistd.h>

diff --git a/src/kauth/kaauxdb.c b/src/kauth/kaauxdb.c
index aef045dfe5091ebe813eb8c41cd74557e20cb61e..507500a8f12581c28b708b75a2288ce7e880737d 100644 (file)
--- a/src/kauth/kaauxdb.c
+++ b/src/kauth/kaauxdb.c
@@ -25,13 +25,7 @@ RCSID
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <rx/rxkad.h>
 #include "ubik_int.h"
 #include "kauth.h"

diff --git a/src/kauth/kadatabase.c b/src/kauth/kadatabase.c
index c3bee37b4c77c317bb172cf70040f696f7a89be4..a1e658081837320d85ec087da556768df1a79dde 100644 (file)
--- a/src/kauth/kadatabase.c
+++ b/src/kauth/kadatabase.c
@@ -19,14 +19,7 @@ RCSID
 #else
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-#include <lock.h>
 #include <ubik.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>

diff --git a/src/kauth/kalocalcell.c b/src/kauth/kalocalcell.c
index 0081e9c7e6607eefa7c08736d613cb0ab3cbffd2..a2e7c070317e8acdad350cc0319b9902572f1fe0 100644 (file)
--- a/src/kauth/kalocalcell.c
+++ b/src/kauth/kalocalcell.c
@@ -37,13 +37,7 @@ RCSID
 #else
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <afs/cellconfig.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>

diff --git a/src/kauth/kalog.c b/src/kauth/kalog.c
index bd51f247b824fea9e777a72fc4bc4d413cd94172..8bc6cbddf484d3a594616fb543d92fc4566ca4f3 100644 (file)
--- a/src/kauth/kalog.c
+++ b/src/kauth/kalog.c
@@ -24,13 +24,7 @@ RCSID
 
 #include <stdio.h>
 #include <afs/afsutil.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif

diff --git a/src/kauth/kas.c b/src/kauth/kas.c
index 8ecfa6140e066f358feed5c0d9e60ded17bc22c9..ca75c536f2168919d935a6a387add544be1c8599 100644 (file)
--- a/src/kauth/kas.c
+++ b/src/kauth/kas.c
@@ -29,13 +29,7 @@ RCSID
 #else
 #include <WINNT/afsevent.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <afs/cellconfig.h>
 #include <afs/com_err.h>
 

diff --git a/src/kauth/kaserver.c b/src/kauth/kaserver.c
index 2b5e9a9bb8b2a20e17b06afe785482f61966c54c..62e192522eb098aa9b85d04cbeb3023652929e69 100644 (file)
--- a/src/kauth/kaserver.c
+++ b/src/kauth/kaserver.c
@@ -26,13 +26,7 @@ RCSID
 #include "kalog.h"             /* for OpenLog() */
 #include <time.h>
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif

diff --git a/src/kauth/kautils.c b/src/kauth/kautils.c
index 2a43c4f1b9c6367f2ba9dce27489f8f07d8fa9e5..21ee9d772c4ebfba78cde068a9786e9fc61398be 100644 (file)
--- a/src/kauth/kautils.c
+++ b/src/kauth/kautils.c
@@ -22,13 +22,7 @@ RCSID
 #include <netinet/in.h>
 #include <sys/file.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <time.h>
 #include <stdio.h>
 #include <ctype.h>

diff --git a/src/kauth/klog.c b/src/kauth/klog.c
index 060e6f0bc062e70af5743d5e70032dea4182d77e..c9ab643efce909bb9cf1e4c3e99155c6f8dd8fbd 100644 (file)
--- a/src/kauth/klog.c
+++ b/src/kauth/klog.c
@@ -19,14 +19,7 @@ RCSID
 #ifdef AFS_AIX32_ENV
 #include <signal.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include <lock.h>
 #include <ubik.h>
 

diff --git a/src/kauth/knfs.c b/src/kauth/knfs.c
index 68f08e52545600820fb20042307735dae0551c63..6f4a9823aaccf3196c91db41a566b857f99feb6c 100644 (file)
--- a/src/kauth/knfs.c
+++ b/src/kauth/knfs.c
@@ -27,13 +27,7 @@ RCSID
 #include <netdb.h>
 #include <errno.h>
 #include <sys/ioctl.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <afs/vice.h>
 #include <afs/cmd.h>
 #include <afs/auth.h>

diff --git a/src/kauth/kpasswd.c b/src/kauth/kpasswd.c
index 211b2f704eb8a622d9f9b5a562692c374ca4300c..f1d3d54785443a9afe6a4a1be8100d71bc3042c6 100644 (file)
--- a/src/kauth/kpasswd.c
+++ b/src/kauth/kpasswd.c
@@ -29,13 +29,7 @@ RCSID
 #ifndef AFS_NT40_ENV
 #include <pwd.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <signal.h>
 #include <afs/com_err.h>
 #include <afs/auth.h>

diff --git a/src/kauth/kpwvalid.c b/src/kauth/kpwvalid.c
index e42ed953c68d41c2b563b7ccecd05a8833bad34e..703a5b6e8f2231afb857f456c2db36b60e378208 100644 (file)
--- a/src/kauth/kpwvalid.c
+++ b/src/kauth/kpwvalid.c
@@ -14,13 +14,7 @@ RCSID
     ("$Header$");
 
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef AFS_NT40_ENV
 #include <WINNT/afsevent.h>
 #endif

diff --git a/src/kauth/krb_tf.c b/src/kauth/krb_tf.c
index 21090569b632c77b0a791e8218e3bbe81dd78378..7d577afe964254e3558b614c93b5bf4b8f2f5be0 100644 (file)
--- a/src/kauth/krb_tf.c
+++ b/src/kauth/krb_tf.c
@@ -58,13 +58,7 @@ RCSID
 #else
 #include <sys/file.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <sys/types.h>
 #include <rx/xdr.h>
 #include <errno.h>

diff --git a/src/kauth/krb_udp.c b/src/kauth/krb_udp.c
index 68d213c55f51ff2f47a14a41f05b9049710c1fb3..110a564822dee1ab9fa0f1f653785e86c0e5da08 100644 (file)
--- a/src/kauth/krb_udp.c
+++ b/src/kauth/krb_udp.c
@@ -30,13 +30,7 @@ RCSID
 #include <netdb.h>
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <afs/afsutil.h>
 #include <time.h>
 #include <afs/com_err.h>

diff --git a/src/kauth/read_passwd.c b/src/kauth/read_passwd.c
index 0cac47afc131b53d41e5c1bd0d3572a0512e1a55..28f40535eecd040388d4f46c7ae35fa3e5d16ad7 100644 (file)
--- a/src/kauth/read_passwd.c
+++ b/src/kauth/read_passwd.c
@@ -35,14 +35,7 @@ int strcmp();
 #if defined(AFS_SGI_ENV)
 #include <signal.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 
 #if    defined (AFS_AIX_ENV) || defined(AFS_SGI_ENV)
 /* Just temp till we figure out the aix stuff */

diff --git a/src/kauth/rebuild.c b/src/kauth/rebuild.c
index 08d57dbd03ba89c09151fa5c4f9876a0be69c38c..606f33b749be1b3f3028eabf5f961702d2362134 100644 (file)
--- a/src/kauth/rebuild.c
+++ b/src/kauth/rebuild.c
@@ -23,13 +23,7 @@ RCSID
 #include <sys/file.h>
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <stdio.h>
 #include <errno.h>
 #include <time.h>

diff --git a/src/kauth/token.c b/src/kauth/token.c
index 7a126bba783ec2c9b80d7ff2d6cacfd155fe7fcf..d28e3c70205a9bfd1f328d4a44991142be1644e3 100644 (file)
--- a/src/kauth/token.c
+++ b/src/kauth/token.c
@@ -44,13 +44,7 @@ RCSID
 #include <sys/socket.h>
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 /* netinet/in.h and cellconfig.h  are needed together */
 #include <afs/cellconfig.h>
     /* these are needed together */

diff --git a/src/kauth/user.c b/src/kauth/user.c
index f53730a6b83b431bbcceb70a4f445091a6e2f51f..7a188d7a2930205f3a401f8bf35e50774549e447 100644 (file)
--- a/src/kauth/user.c
+++ b/src/kauth/user.c
@@ -45,13 +45,7 @@ RCSID
 #else
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <afs/cellconfig.h>
 #include <afs/auth.h>
 #include <afs/ptint.h>

diff --git a/src/libacl/aclprocs.c b/src/libacl/aclprocs.c
index cf97e73a120f4fbf8cb4d95c8cb654f996fed0a4..729768755275e127c757bae57a36e6c2e3deb3c6 100644 (file)
--- a/src/libacl/aclprocs.c
+++ b/src/libacl/aclprocs.c
@@ -25,9 +25,7 @@ RCSID
 #else
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <afs/ptclient.h>

diff --git a/src/libadmin/bos/afs_bosAdmin.c b/src/libadmin/bos/afs_bosAdmin.c
index ed7f21e65759c9dbeb57c4672b6c4928f26e2f7c..6ad03a7a48404898d0a49979800e1b2fb8f64b2d 100644 (file)
--- a/src/libadmin/bos/afs_bosAdmin.c
+++ b/src/libadmin/bos/afs_bosAdmin.c
@@ -32,14 +32,7 @@ RCSID
 #else
 #include <unistd.h>
 #endif
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 typedef struct bos_server {
     int begin_magic;

diff --git a/src/libadmin/cfg/cfgclient.c b/src/libadmin/cfg/cfgclient.c
index 3d2aadd84e9b8de49ff32d9084276303bb7b181e..339887beccd13efe6dced677719b14e5f9bce419 100644 (file)
--- a/src/libadmin/cfg/cfgclient.c
+++ b/src/libadmin/cfg/cfgclient.c
@@ -23,15 +23,7 @@ RCSID
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include <pthread.h>
 
 #include <afs/afs_Admin.h>

diff --git a/src/libadmin/kas/afs_kasAdmin.c b/src/libadmin/kas/afs_kasAdmin.c
index 468b72583a5a04232cabb727963cea2230cab021..d3bbdce1d0eda8660b09ff49c0da0462df668380 100644 (file)
--- a/src/libadmin/kas/afs_kasAdmin.c
+++ b/src/libadmin/kas/afs_kasAdmin.c
@@ -14,14 +14,7 @@ RCSID
     ("$Header$");
 
 #include <stdio.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include <afs/stds.h>
 #include "afs_kasAdmin.h"

diff --git a/src/libadmin/pts/afs_ptsAdmin.c b/src/libadmin/pts/afs_ptsAdmin.c
index f46764b70a6fafcbe4e622cdad9fb37f2d19eb45..07286a1d64c5b808cd34dcb210422fb229dccf9f 100644 (file)
--- a/src/libadmin/pts/afs_ptsAdmin.c
+++ b/src/libadmin/pts/afs_ptsAdmin.c
@@ -14,15 +14,6 @@ RCSID
     ("$Header$");
 
 #include <stdio.h>
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include <afs/stds.h>
 #include "afs_ptsAdmin.h"
 #include "../adminutil/afs_AdminInternal.h"

diff --git a/src/libadmin/samples/rxdebug_rx_stats.c b/src/libadmin/samples/rxdebug_rx_stats.c
index d4d230eb82d2cd5d79a7349c7f10cc6cf90fb744..b8ed0af327a53b62cf81489f8ee98461f650ad26 100644 (file)
--- a/src/libadmin/samples/rxdebug_rx_stats.c
+++ b/src/libadmin/samples/rxdebug_rx_stats.c
@@ -23,15 +23,7 @@ RCSID
 #include <winsock2.h>
 #include <pthread.h>
 #endif
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>

diff --git a/src/libadmin/samples/rxstat_get_peer.c b/src/libadmin/samples/rxstat_get_peer.c
index 3b2504007716c6ab6e707bbce1cc5b427e45b47d..0632411ea2a42aff90d3b7c7cb0a8c7648f6b76a 100644 (file)
--- a/src/libadmin/samples/rxstat_get_peer.c
+++ b/src/libadmin/samples/rxstat_get_peer.c
@@ -24,13 +24,7 @@ RCSID
 #include <pthread.h>
 #endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include <afs/afs_Admin.h>
 #include <afs/afs_AdminErrors.h>

diff --git a/src/libadmin/samples/rxstat_get_process.c b/src/libadmin/samples/rxstat_get_process.c
index 0eb31bdabaf00c8fe77521a64775d90478ecb11a..6c7bc35716a672f6d332ea1d5dba75105c90dd53 100644 (file)
--- a/src/libadmin/samples/rxstat_get_process.c
+++ b/src/libadmin/samples/rxstat_get_process.c
@@ -23,14 +23,7 @@ RCSID
 #include <winsock2.h>
 #include <pthread.h>
 #endif
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include <afs/afs_Admin.h>
 #include <afs/afs_AdminErrors.h>

diff --git a/src/libadmin/vos/afs_vosAdmin.c b/src/libadmin/vos/afs_vosAdmin.c
index 6ab85ed9d11a144f94321db511715344a57ef48d..ff5b7c16fc72d19a8f38cc2293f56e505fd5328b 100644 (file)
--- a/src/libadmin/vos/afs_vosAdmin.c
+++ b/src/libadmin/vos/afs_vosAdmin.c
@@ -15,13 +15,7 @@ RCSID
 
 #include <afs/stds.h>
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <ctype.h>
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>

diff --git a/src/libadmin/vos/lockprocs.c b/src/libadmin/vos/lockprocs.c
index 5234a265ab0231c860b09a8ade071c44338481d9..bc72dfd7990bd027ec5f61f71db30b119c79cbc3 100644 (file)
--- a/src/libadmin/vos/lockprocs.c
+++ b/src/libadmin/vos/lockprocs.c
@@ -14,13 +14,7 @@ RCSID
     ("$Header$");
 
 #include "lockprocs.h"
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 /* Finds an index in VLDB entry that matches the volume type, server, and partition.
  * If type is zero, will match first index of ANY type (RW, BK, or RO).

diff --git a/src/libadmin/vos/vosutils.c b/src/libadmin/vos/vosutils.c
index a33925216b79badfede113bb7e9f199d91a29b97..4042bc1048613352ec71ecf77926833d7cf65349 100644 (file)
--- a/src/libadmin/vos/vosutils.c
+++ b/src/libadmin/vos/vosutils.c
@@ -17,13 +17,7 @@ RCSID
 #include "vsprocs.h"
 #include "lockprocs.h"
 #include <afs/afs_AdminErrors.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 /*
  * VLDB entry conversion routines.

diff --git a/src/libadmin/vos/vsprocs.c b/src/libadmin/vos/vsprocs.c
index 00c4ad13bf2682de74740b95a00df646e48cc42d..7b6b5e9ccb6b2306d6c3b36b3303b68a73c3aeca 100644 (file)
--- a/src/libadmin/vos/vsprocs.c
+++ b/src/libadmin/vos/vsprocs.c
@@ -30,13 +30,7 @@ RCSID
 #include "../adminutil/afs_AdminInternal.h"
 #include <afs/afs_AdminErrors.h>
 #include "afs_vosAdmin.h"
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/log/kseal.c b/src/log/kseal.c
index 703954db23fb1e240056d3c41d0c11c6ab81f8c2..d42df102bb2cd19102ae3cac649311d3de697afd 100644 (file)
--- a/src/log/kseal.c
+++ b/src/log/kseal.c
@@ -19,13 +19,7 @@ RCSID
 #include <signal.h>
 #endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include <afs/cellconfig.h>
 #include <afs/afsutil.h>

diff --git a/src/log/tokens.c b/src/log/tokens.c
index 2946735bb0571b6562ef133fc3e80e7fbcc7df3e..70dd3776deb172345281b870fe592ef8a8eb9280 100644 (file)
--- a/src/log/tokens.c
+++ b/src/log/tokens.c
@@ -25,14 +25,7 @@ RCSID
 #include <time.h>              /*time(), ctime() */
 #include <pwd.h>
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 
 #define VIRTUE
 #define VICE

diff --git a/src/log/unlog.c b/src/log/unlog.c
index ba4939d9362e43dbb4c2993281e31293ddfc430f..44eb712d4b92d8781dd2507e9a8df0f8d53d2dea 100644 (file)
--- a/src/log/unlog.c
+++ b/src/log/unlog.c
@@ -38,14 +38,7 @@ RCSID
 #include <signal.h>
 #endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>

diff --git a/src/lwp/lwp.c b/src/lwp/lwp.c
index 2b7649cec8267d6fed23102f8d9665a2042fd639..71a4b40fc60bbc0589502ef513146544fe821e01 100644 (file)
--- a/src/lwp/lwp.c
+++ b/src/lwp/lwp.c
@@ -39,13 +39,7 @@ int setlim(int limcon, uchar_t hard, int limit);
 extern char *getenv();
 #include <time.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #if    !defined(USE_PTHREADS) && !defined(USE_SOLARIS_THREADS)
 

diff --git a/src/lwp/threadname.c b/src/lwp/threadname.c
index f36b3170bd1aa8943be3f5f05d008b68445ec57b..3f7e9be0a048bdbfc357963dc13acb1c36f5195c 100644 (file)
--- a/src/lwp/threadname.c
+++ b/src/lwp/threadname.c
@@ -25,13 +25,8 @@
 RCSID
     ("$Header$");
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
+
 #if defined(AFS_PTHREAD_ENV)
 #include <pthread.h>
 #else /* defined(AFS_PTHREAD_ENV) */

diff --git a/src/lwp/waitkey.c b/src/lwp/waitkey.c
index e31e0c52506425e13cd6dbb99c758720e2b08e1d..5d2a88476d1478ddf8cb4fa419eb7f312757cc1c 100644 (file)
--- a/src/lwp/waitkey.c
+++ b/src/lwp/waitkey.c
@@ -35,13 +35,7 @@ RCSID
 #include <sys/time.h>
 #include <unistd.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include "lwp.h"
 
 #define LWP_KEYSTROKE_DELAY   250      /* 250ms. Must be < 1000 */

diff --git a/src/pam/afs_pam_msg.c b/src/pam/afs_pam_msg.c
index c1f702355a2f03acaed456723909b2cdbe895b33..d36bd54a6f6e857ebf1821d6bf99a39448b6c46d 100644 (file)
--- a/src/pam/afs_pam_msg.c
+++ b/src/pam/afs_pam_msg.c
@@ -14,13 +14,7 @@ RCSID
     ("$Header$");
 
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <stdlib.h>
 #include <security/pam_appl.h>
 #include "afs_pam_msg.h"

diff --git a/src/pam/afs_util.c b/src/pam/afs_util.c
index e98618e7c5fc7418fcc674d09aa75f05ad3eb28d..cf8ae25fe6562ea5ae4e7254361a3f3dcc102740 100644 (file)
--- a/src/pam/afs_util.c
+++ b/src/pam/afs_util.c
@@ -17,13 +17,7 @@
 #include <afs/param.h>
 #include <sys/wait.h>
 #include <limits.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <stdlib.h>
 
 RCSID

diff --git a/src/ptserver/db_verify.c b/src/ptserver/db_verify.c
index 62c5f2c428498757da6810b49339b22ad0716243..9d321f586540f6656bbf1b8d52dd01963a29fd7d 100644 (file)
--- a/src/ptserver/db_verify.c
+++ b/src/ptserver/db_verify.c
@@ -44,13 +44,7 @@ RCSID
 #include <sys/file.h>
 #endif
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <afs/cellconfig.h>

diff --git a/src/ptserver/display.c b/src/ptserver/display.c
index 4ac88b46a2f5cc8c3ec069123389460f6a1f481a..4126831c45a0e16845a8a4f66c1b82aa24c1a461 100644 (file)
--- a/src/ptserver/display.c
+++ b/src/ptserver/display.c
@@ -20,13 +20,7 @@ RCSID
 #else
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <stdio.h>
 #include "ptserver.h"
 

diff --git a/src/ptserver/ptprocs.c b/src/ptserver/ptprocs.c
index 224dcf482a6030e9c9149a45ff0978102866b92a..d5ee87102189cedc873ae43f023c7578a9d510eb 100644 (file)
--- a/src/ptserver/ptprocs.c
+++ b/src/ptserver/ptprocs.c
@@ -69,13 +69,7 @@ RCSID
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include "ptserver.h"
 #include "pterror.h"
 #include "ptprototypes.h"

diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c
index 6d78a0211d57b72aba6334083c37a9e64cd51626..32658e33b6cef207777c0625fe4aa88f2e3a7c30 100644 (file)
--- a/src/ptserver/ptserver.c
+++ b/src/ptserver/ptserver.c
@@ -130,13 +130,7 @@ RCSID
 #include <netdb.h>
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <rx/rx_globals.h>

diff --git a/src/ptserver/ptuser.c b/src/ptserver/ptuser.c
index d84ff63e195bb9d26b6ba659c85f0aa907a55307..8405ee0ac860dffffaec4731178888e514e1d738 100644 (file)
--- a/src/ptserver/ptuser.c
+++ b/src/ptserver/ptuser.c
@@ -41,13 +41,7 @@ RCSID
 #include <netinet/in.h>
 #endif
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <rx/rx.h>
 #include <rx/xdr.h>
 #include <rx/rxkad.h>

diff --git a/src/ptserver/ptutils.c b/src/ptserver/ptutils.c
index f7ad70d435529c750e4e0ec882f26d2abc66810a..3c2b83b695fe616953eb13ddd950867f34228b94 100644 (file)
--- a/src/ptserver/ptutils.c
+++ b/src/ptserver/ptutils.c
@@ -34,13 +34,7 @@ RCSID
 #else
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <lock.h>
 #include <ubik.h>
 #include <rx/xdr.h>

diff --git a/src/ptserver/readgroup.c b/src/ptserver/readgroup.c
index 52300ae1a88df747d516b90b5f90f7a5705de63f..954ba316f743975a9f9e7a0af76d5454cc5ba5ce 100644 (file)
--- a/src/ptserver/readgroup.c
+++ b/src/ptserver/readgroup.c
@@ -18,13 +18,7 @@ RCSID
 #include <WINNT/afsevent.h>
 #endif
 #include <ctype.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <rx/rx.h>
 #include <rx/xdr.h>
 #include <afs/cellconfig.h>

diff --git a/src/ptserver/readpwd.c b/src/ptserver/readpwd.c
index 9b9870e20dbb3ac133df9dcd9a5623cc018b46e8..3131b0b7721f2366f52d1839d0cc6dff44e7b2e7 100644 (file)
--- a/src/ptserver/readpwd.c
+++ b/src/ptserver/readpwd.c
@@ -17,13 +17,7 @@ RCSID
 #ifdef AFS_NT40_ENV
 #include <WINNT/afsevent.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <rx/rx.h>
 #include <rx/xdr.h>
 #include <afs/cellconfig.h>

diff --git a/src/ptserver/testpt.c b/src/ptserver/testpt.c
index 064cf54f51e0ec33258ba140e3d2439e3be1a713..ab9f408d3e525320bb3d2f13c03354cf7237ec1c 100644 (file)
--- a/src/ptserver/testpt.c
+++ b/src/ptserver/testpt.c
@@ -24,13 +24,7 @@ RCSID
 #include <netdb.h>
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif

diff --git a/src/ptserver/ubik.c b/src/ptserver/ubik.c
index 1739c94f3d29f730184056d7059ad50ec36fc7f5..a68a82522aca6fbdbda9ea9039723c12bf7a09d2 100644 (file)
--- a/src/ptserver/ubik.c
+++ b/src/ptserver/ubik.c
@@ -8,14 +8,7 @@ RCSID
 
 #include <sys/types.h>
 #include <netinet/in.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include <lock.h>
 #define UBIK_INTERNALS

diff --git a/src/ptserver/utils.c b/src/ptserver/utils.c
index 50407375700310fa21cb2ee3868885fc4ba0a1a4..ee01ac38c4357fbb0b07521ea81c8600b5a806e7 100644 (file)
--- a/src/ptserver/utils.c
+++ b/src/ptserver/utils.c
@@ -23,13 +23,7 @@ RCSID
 #include <netinet/in.h>
 #include <netdb.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include "ptserver.h"
 #include "pterror.h"
 

diff --git a/src/rx/rx.c b/src/rx/rx.c
index 7d8ec3b9a5aa9c6a8620f71e270ebfa6261a30ee..bd13a9c78d1ebe18bb2e6246aee945d7ad52e412 100644 (file)
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -79,6 +79,7 @@ extern afs_int32 afs_termState;
 # include "rxgen_consts.h"
 #else /* KERNEL */
 # include <sys/types.h>
+# include <string.h>
 # include <errno.h>
 #ifdef AFS_NT40_ENV
 # include <stdlib.h>
@@ -92,13 +93,6 @@ extern afs_int32 afs_termState;
 # include <netinet/in.h>
 # include <sys/time.h>
 #endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 # include "rx.h"
 # include "rx_user.h"
 # include "rx_clock.h"

diff --git a/src/rx/rx_misc.c b/src/rx/rx_misc.c
index 4b9761d189c18b54184e39ecdd462ea3951fe4db..2dd3b045afe3065fe893183a1347da62bbbceff3 100644 (file)
--- a/src/rx/rx_misc.c
+++ b/src/rx/rx_misc.c
@@ -30,13 +30,7 @@ RCSID
 #include "rx.h"
 #endif /* AFS_PTHREAD_ENV */
 #include <stdlib.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c
index 1c19d7526aa361260d50a3e72862bdce22ebd93e..9a18390b932f6fd042b20acd7f21674510d205b7 100644 (file)
--- a/src/rx/rx_packet.c
+++ b/src/rx/rx_packet.c
@@ -88,13 +88,7 @@ RCSID
 #include "rx_globals.h"
 #include <lwp.h>
 #include <assert.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/rx/rx_pthread.c b/src/rx/rx_pthread.c
index 4e622d806acb73058cf0e3482fd871716d3c5590..1f575711ca61b9499ae767b92ad747bc468a776c 100644 (file)
--- a/src/rx/rx_pthread.c
+++ b/src/rx/rx_pthread.c
@@ -24,6 +24,7 @@ RCSID
 #include <sys/types.h>
 #include <errno.h>
 #include <signal.h>
+#include <string.h>
 #ifndef AFS_NT40_ENV
 # include <sys/socket.h>
 # include <sys/file.h>

diff --git a/src/rx/rx_rdwr.c b/src/rx/rx_rdwr.c
index b4b34ce883ed71e43d4d7787ec24b2566f0ba9ea..8f336b1d8aad9a1791a4cf3b7f79237824bcba66 100644 (file)
--- a/src/rx/rx_rdwr.c
+++ b/src/rx/rx_rdwr.c
@@ -79,13 +79,7 @@ RCSID
 # include <sys/stat.h>
 # include <sys/time.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/rx/rx_trace.c b/src/rx/rx_trace.c
index dfb1735305510287b1ed887f4e60f8f1828640ce..ac7a6e69d4956f45501d99311a7a4f114c79caa1 100644 (file)
--- a/src/rx/rx_trace.c
+++ b/src/rx/rx_trace.c
@@ -14,13 +14,7 @@ RCSID
     ("$Header$");
 
 #ifdef RXDEBUG
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef AFS_NT40_ENV
 #include <fcntl.h>
 #include <io.h>

diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c
index 9fc0be920ec3dac061cbfcf8fe17e9218a0f185b..ebbe522b928f40f2af3ef72ba97586e96584d3b4 100644 (file)
--- a/src/rx/rx_user.c
+++ b/src/rx/rx_user.c
@@ -18,6 +18,7 @@ RCSID
 # include <sys/types.h>
 # include <errno.h>
 # include <signal.h>
+# include <string.h>
 #ifdef AFS_NT40_ENV
 # include <WINNT/syscfg.h>
 #else
@@ -36,13 +37,6 @@ RCSID
 #endif
 #include <afs/afs_args.h>
 #include <afs/afsutil.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #ifndef        IPPORT_USERRESERVED
 /* If in.h doesn't define this, define it anyway.  Unfortunately, defining

diff --git a/src/rx/xdr.c b/src/rx/xdr.c
index 5816ef162cfaddd111db0e20f25ba6d3e1c829d0..54011e6ae40c03bd38e5f43221ccfcede5387680 100644 (file)
--- a/src/rx/xdr.c
+++ b/src/rx/xdr.c
@@ -32,6 +32,7 @@
 #include "afs/param.h"
 #else
 #include <afs/param.h>
+#include <string.h>
 #endif
 
 RCSID

diff --git a/src/rx/xdr_array.c b/src/rx/xdr_array.c
index 81c1ba59c1f332563e599d43437d35cbcd2458ca..a687df4e7730c06b4df681fc8a014258ece38679 100644 (file)
--- a/src/rx/xdr_array.c
+++ b/src/rx/xdr_array.c
@@ -58,6 +58,7 @@ RCSID
 #endif /* AFS_LINUX20_ENV */
 #else
 #include <stdio.h>
+#include <string.h>
 #endif
 #include "xdr.h"
 

diff --git a/src/rx/xdr_rec.c b/src/rx/xdr_rec.c
index 0abbec61bc3fd3c5e7ba7354d52ebbe362474272..52d65b3f7bb8470c7baf9912723145f96aeb7968 100644 (file)
--- a/src/rx/xdr_rec.c
+++ b/src/rx/xdr_rec.c
@@ -59,13 +59,7 @@ RCSID
 #include <netinet/in.h>
 #endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 
 /*  * A record is composed of one or more record fragments.

diff --git a/src/rx/xdr_refernce.c b/src/rx/xdr_refernce.c
index 9145eb6723a42dc2ea9ab1571066918c586ee556..f8aa058802a960e24347674039d572632eb83d5f 100644 (file)
--- a/src/rx/xdr_refernce.c
+++ b/src/rx/xdr_refernce.c
@@ -46,6 +46,7 @@ RCSID
 
 #include "xdr.h"
 #include <stdio.h>
+#include <string.h>
 #define LASTUNSIGNED   ((u_int)0-1)
 
 /*

diff --git a/src/rxdebug/rxdebug.c b/src/rxdebug/rxdebug.c
index 85a329d419757b23680e68ab7ff5b0a739afb998..dcc3ab8e8ace864be9bf473354e0a3e820ece97b 100644 (file)
--- a/src/rxdebug/rxdebug.c
+++ b/src/rxdebug/rxdebug.c
@@ -32,13 +32,7 @@ RCSID
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <sys/stat.h>
 #include <afs/stds.h>
 #include <afs/cmd.h>

diff --git a/src/rxgen/rpc_cout.c b/src/rxgen/rpc_cout.c
index 66599be93161ad5f17bb74421c6c76198ab91861..92a864534e91ddc5fb7c2adb10cf88747a390643 100644 (file)
--- a/src/rxgen/rpc_cout.c
+++ b/src/rxgen/rpc_cout.c
@@ -40,13 +40,7 @@ RCSID
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include "rpc_scan.h"
 #include "rpc_parse.h"
 #include "rpc_util.h"

diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c
index 92b197bae0f1a03d59b247522b0bba27226b7b26..d035a731b0292c7cd797cffe526870f6c7c04ce7 100644 (file)
--- a/src/rxgen/rpc_main.c
+++ b/src/rxgen/rpc_main.c
@@ -43,13 +43,7 @@ RCSID
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif

diff --git a/src/rxgen/rpc_parse.c b/src/rxgen/rpc_parse.c
index a8fe4adf926072d5ef60f95de817b77323fa373b..55c708f054304ea70b97267a7247ac4b7ef28a91 100644 (file)
--- a/src/rxgen/rpc_parse.c
+++ b/src/rxgen/rpc_parse.c
@@ -41,13 +41,7 @@ RCSID
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include "rpc_scan.h"
 #include "rpc_parse.h"
 #include "rpc_util.h"

diff --git a/src/rxgen/rpc_scan.c b/src/rxgen/rpc_scan.c
index 1137068109526fcc187fc960f198519945e8e35d..944777674e308e112bbfe1006f1cebabc7aaee25 100644 (file)
--- a/src/rxgen/rpc_scan.c
+++ b/src/rxgen/rpc_scan.c
@@ -43,13 +43,8 @@ RCSID
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
+
 #include "rpc_scan.h"
 #include "rpc_parse.h"
 #include "rpc_util.h"

diff --git a/src/rxgen/rpc_svcout.c b/src/rxgen/rpc_svcout.c
index 6e717f6356a6da1dcbe870ed76fc01768a865bf1..288e6ea8c6fd62d59171b5ac3c6f8bbd2917dc1f 100644 (file)
--- a/src/rxgen/rpc_svcout.c
+++ b/src/rxgen/rpc_svcout.c
@@ -39,13 +39,7 @@ RCSID
     ("$Header$");
 
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include "rpc_scan.h"
 #include "rpc_parse.h"
 #include "rpc_util.h"

diff --git a/src/rxgen/rpc_util.c b/src/rxgen/rpc_util.c
index 9794442a67420aa4e6068518febb25ccd54aaa47..232c1fbe6cf0d525119c9b6e42efec16282ea722 100644 (file)
--- a/src/rxgen/rpc_util.c
+++ b/src/rxgen/rpc_util.c
@@ -39,13 +39,7 @@ RCSID
     ("$Header$");
 
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/rxkad/crc.c b/src/rxkad/crc.c
index a7e93fc29005c9c70c5dbbcb920982fd11a4cfc8..65a48273130b3294261c8a5400ce06dc0b601133 100644 (file)
--- a/src/rxkad/crc.c
+++ b/src/rxkad/crc.c
@@ -60,13 +60,7 @@ RCSID
 #else
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <des.h>

diff --git a/src/rxkad/domestic/crypt_conn.c b/src/rxkad/domestic/crypt_conn.c
index f827e04d7efc56aea474ffc2c0273a25cdd9ff23..6d94ddbf773b8c10ea271d27817612b5c0eb026e 100644 (file)
--- a/src/rxkad/domestic/crypt_conn.c
+++ b/src/rxkad/domestic/crypt_conn.c
@@ -37,6 +37,7 @@ RCSID
 #else /* !KERNEL */
 #include <afs/stds.h>
 #include <sys/types.h>
+#include <string.h>
 #include <rx/rx.h>
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>

diff --git a/src/rxkad/domestic/fcrypt.c b/src/rxkad/domestic/fcrypt.c
index 8d1884da6314936cc69c081cd6ff9a270be4665a..c9ec88682d818a419b07a75022e7c6881eeac188 100644 (file)
--- a/src/rxkad/domestic/fcrypt.c
+++ b/src/rxkad/domestic/fcrypt.c
@@ -47,6 +47,7 @@ RCSID
 
 #include <afs/stds.h>
 #include <sys/types.h>
+#include <string.h>
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
 #else

diff --git a/src/rxkad/md4.c b/src/rxkad/md4.c
index 6844caf78132483638e99bd0c61a1cff7e6b5378..4c61fc1cb330f3340823418ecdf6fa3a6b91cc39 100644 (file)
--- a/src/rxkad/md4.c
+++ b/src/rxkad/md4.c
@@ -55,13 +55,7 @@
 #else
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <des.h>

diff --git a/src/rxkad/md5.c b/src/rxkad/md5.c
index 397023bb42c1c9286725fd9c2f202e63e6ff3b72..0e9fcf2c7838f7340d33b60e2d1f2e868e695170 100644 (file)
--- a/src/rxkad/md5.c
+++ b/src/rxkad/md5.c
@@ -55,14 +55,7 @@
 #else
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-#include <rx/xdr.h>
 #include <rx/rx.h>
 #include <des.h>
 #include "lifetimes.h"

diff --git a/src/rxkad/rxkad_client.c b/src/rxkad/rxkad_client.c
index 1f83e2c17bbabfa57c4111448b1dca0e67897c6b..6b34e0b3a3db0b89744805f98fcb23acdf98a720 100644 (file)
--- a/src/rxkad/rxkad_client.c
+++ b/src/rxkad/rxkad_client.c
@@ -47,13 +47,7 @@ RCSID
 #include <afs/stds.h>
 #include <sys/types.h>
 #include <time.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
 #else

diff --git a/src/rxkad/rxkad_common.c b/src/rxkad/rxkad_common.c
index d71cd33619848bd1dd8f27956ca4c976c9f66b6e..0d1351ddcbb4f22f6e2eb1cb687489c76bf43108 100644 (file)
--- a/src/rxkad/rxkad_common.c
+++ b/src/rxkad/rxkad_common.c
@@ -50,6 +50,7 @@ RCSID
 #else /* KERNEL */
 #include <afs/stds.h>
 #include <sys/types.h>
+#include <string.h>
 #include <time.h>
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
@@ -61,13 +62,6 @@ RCSID
 #endif
 #include <rx/rx.h>
 #include <rx/xdr.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <afs/afsutil.h>
 #endif /* KERNEL */
 

diff --git a/src/rxkad/rxkad_server.c b/src/rxkad/rxkad_server.c
index 2e91c6b5f8a916cb3834b71165c69892303af8af..04308259310a7273126f92dc5884f5cdc772511d 100644 (file)
--- a/src/rxkad/rxkad_server.c
+++ b/src/rxkad/rxkad_server.c
@@ -28,13 +28,7 @@ RCSID
 #else
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <rx/rx.h>
 #include <rx/xdr.h>
 #include <des.h>

diff --git a/src/rxkad/ticket.c b/src/rxkad/ticket.c
index e8300b9764c3acffd02d1670c6044d2a22b62871..54bb3cd0c284b0daca68209221b0bea830922795 100644 (file)
--- a/src/rxkad/ticket.c
+++ b/src/rxkad/ticket.c
@@ -34,13 +34,7 @@ RCSID
 #else
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <des.h>

diff --git a/src/rxkad/ticket5.c b/src/rxkad/ticket5.c
index 126721c17e2225e19d03be49c614c45bd62f9bb2..cd7425fc72812706725e785d4c6c3951017dc5d1 100644 (file)
--- a/src/rxkad/ticket5.c
+++ b/src/rxkad/ticket5.c
@@ -81,13 +81,7 @@ RCSID
 #else
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <des.h>

diff --git a/src/scout/scout.c b/src/scout/scout.c
index 7b5995d97cc230c55c9f457c575a544b5290acf5..c408e36572863c3b082d12d825349fc15702226d 100644 (file)
--- a/src/scout/scout.c
+++ b/src/scout/scout.c
@@ -21,13 +21,7 @@ RCSID
 #ifdef AFS_AIX32_ENV
 #include <signal.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #undef IN
 #include <gtxwindows.h>                /*Generic window package */
 #include <gtxobjects.h>                /*Object definitions */

diff --git a/src/sys/pagsh.c b/src/sys/pagsh.c
index 87ab91de8426bf7d3aaa08f4882d23c1be05510f..c2e0b93976005b078a553f264171e5cf4e4870ae 100644 (file)
--- a/src/sys/pagsh.c
+++ b/src/sys/pagsh.c
@@ -22,9 +22,7 @@ RCSID
 #ifndef AFS_NT40_ENV
 #include <unistd.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 #include <pwd.h>
 #ifdef AFS_KERBEROS_ENV
 #include <sys/types.h>

diff --git a/src/sys/rmtsysc.c b/src/sys/rmtsysc.c
index 6d501af123f3d63861c021cce78a3a4838929469..f37b87850481da673fade937bd122dbdec4a7602 100644 (file)
--- a/src/sys/rmtsysc.c
+++ b/src/sys/rmtsysc.c
@@ -31,9 +31,7 @@ RCSID
 #endif
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/sys/rmtsysnet.c b/src/sys/rmtsysnet.c
index 907f93ff821af112b013f21d6587a833aeba0650..c879e73e98625e2b29c0acf82481536252754a21 100644 (file)
--- a/src/sys/rmtsysnet.c
+++ b/src/sys/rmtsysnet.c
@@ -26,13 +26,7 @@ RCSID
 #endif
 #include <sys/stat.h>
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <afs/afsint.h>
 #include <afs/venus.h>
 #include <rx/xdr.h>

diff --git a/src/sys/rmtsyss.c b/src/sys/rmtsyss.c
index 33bb05a5fba350487664fb567787a595427450cd..3e206247b8e7ecd18c70a18ae8bf4260d2b418c4 100644 (file)
--- a/src/sys/rmtsyss.c
+++ b/src/sys/rmtsyss.c
@@ -30,9 +30,7 @@ RCSID
 #include <rx/xdr.h>
 #include <errno.h>
 #include <signal.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 /*#include <afs/cellconfig.h>*/
 #include "rmtsys.h"
 

diff --git a/src/ubik/beacon.c b/src/ubik/beacon.c
index d5b152640875c61292a1e0cd0545fbaaac633a46..3823109611b73412cdc64b3e1102ef46d9c62ca4 100644 (file)
--- a/src/ubik/beacon.c
+++ b/src/ubik/beacon.c
@@ -26,13 +26,7 @@ RCSID
 #endif
 #include <errno.h>
 #include <lock.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <rx/rx_multi.h>

diff --git a/src/ubik/disk.c b/src/ubik/disk.c
index 89b8303892176b62f896ed94b27f584d34528521..2fab5b7bae5eee8c7ee54869ca514c67bcbb5446 100644 (file)
--- a/src/ubik/disk.c
+++ b/src/ubik/disk.c
@@ -21,13 +21,7 @@ RCSID
 #include <netinet/in.h>
 #endif
 #include <errno.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <lock.h>
 #include <rx/xdr.h>
 

diff --git a/src/ubik/phys.c b/src/ubik/phys.c
index caf84aa4917d0575992cedebb11e969b440a97b4..2611056831cc29475177ec816344cbb90cf992d0 100644 (file)
--- a/src/ubik/phys.c
+++ b/src/ubik/phys.c
@@ -26,13 +26,7 @@ RCSID
 #include <lwp.h>
 #include <lock.h>
 #include <errno.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #define        UBIK_INTERNALS 1
 #include "ubik.h"

diff --git a/src/ubik/recovery.c b/src/ubik/recovery.c
index 342b60da089498af3ff1eb03acc9ecd51032974d..389a214913e3badb36954cc94beee66392b20724 100644 (file)
--- a/src/ubik/recovery.c
+++ b/src/ubik/recovery.c
@@ -24,13 +24,7 @@ RCSID
 #endif
 #include <assert.h>
 #include <lock.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <errno.h>

diff --git a/src/ubik/remote.c b/src/ubik/remote.c
index c77b4ec3f127c1350a169a46a07b7e6669afe62f..1f57cdd78fe4eda46592fae831943156a239b040 100644 (file)
--- a/src/ubik/remote.c
+++ b/src/ubik/remote.c
@@ -20,13 +20,7 @@ RCSID
 #include <sys/file.h>
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <lock.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>

diff --git a/src/ubik/ubik.c b/src/ubik/ubik.c
index 2fad57adbe518f0b9117fe60455c3ffe1a67ec94..87beebd300036e6b009f8871f331b8bd4d29eff1 100644 (file)
--- a/src/ubik/ubik.c
+++ b/src/ubik/ubik.c
@@ -23,13 +23,7 @@ RCSID
 #endif
 #include <time.h>
 #include <lock.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <afs/cellconfig.h>

diff --git a/src/ubik/ubikcmd.c b/src/ubik/ubikcmd.c
index cf16f1081ab8ba949eef577e4e56ad8f71ef6d36..06cfca31ea31929eda65d47e7c4e2e2853ff94f1 100644 (file)
--- a/src/ubik/ubikcmd.c
+++ b/src/ubik/ubikcmd.c
@@ -24,13 +24,7 @@ RCSID
 #endif
 #include <time.h>
 #include <lock.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
 

diff --git a/src/ubik/udebug.c b/src/ubik/udebug.c
index 451d5fc2a8b7ec89f0a037b7848a10f269ab4b03..3412d7dfa77bd63050342b87a5a5fe3eea9b43bb 100644 (file)
--- a/src/ubik/udebug.c
+++ b/src/ubik/udebug.c
@@ -15,13 +15,7 @@ RCSID
 
 #include <sys/types.h>
 #include <stdlib.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
 #else

diff --git a/src/ubik/uinit.c b/src/ubik/uinit.c
index 76e66fa6305250436d04ac0e7676ab0730b1472c..be1306ed42b42eabe0da1c010814c70f6e4facaf 100644 (file)
--- a/src/ubik/uinit.c
+++ b/src/ubik/uinit.c
@@ -28,13 +28,7 @@ RCSID
 #include <sys/statfs.h>
 #endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include <afs/dirpath.h>
 #include <errno.h>

diff --git a/src/ubik/utst_client.c b/src/ubik/utst_client.c
index 3852bd18b9969f309b1969c958d09c465b235efd..9387a3533cfa5fa31319c751aa6de508e2deba3e 100644 (file)
--- a/src/ubik/utst_client.c
+++ b/src/ubik/utst_client.c
@@ -24,13 +24,7 @@ RCSID
 #endif
 #include <time.h>
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <lock.h>

diff --git a/src/ubik/utst_server.c b/src/ubik/utst_server.c
index f832c263d87627661ef208ccbfc53f080147a098..eab0cefe935cd1924f457a6f45d1990ea5d8a218 100644 (file)
--- a/src/ubik/utst_server.c
+++ b/src/ubik/utst_server.c
@@ -25,13 +25,7 @@ RCSID
 #endif
 #include <time.h>
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <lock.h>

diff --git a/src/ubik/vote.c b/src/ubik/vote.c
index 0a1f4f230afd3878bc6918d66930c30ca5847808..d61ef05e5d8c8f015b08ce7b17ae3d8da0897b67 100644 (file)
--- a/src/ubik/vote.c
+++ b/src/ubik/vote.c
@@ -22,13 +22,7 @@ RCSID
 #endif
 #include <afs/afsutil.h>
 #include <lock.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <afs/afsutil.h>

diff --git a/src/update/client.c b/src/update/client.c
index b176aacb235563e7a18b8ef3d36d64e29291e91d..d88eb2eb3035042d2824c3551f86b0a693787800 100644 (file)
--- a/src/update/client.c
+++ b/src/update/client.c
@@ -36,13 +36,7 @@ RCSID
 #include <sys/time.h>
 #include <dirent.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/update/server.c b/src/update/server.c
index a0689c8e076a54ebe5b54320e7320cbd9011b4e2..f66edc0ce75ba9e41ad56a24be0a1956b15536dc 100644 (file)
--- a/src/update/server.c
+++ b/src/update/server.c
@@ -31,13 +31,7 @@ RCSID
 #include <sys/file.h>
 #include <dirent.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/update/utils.c b/src/update/utils.c
index 13d6b86c01c0eacc7a082a2b51a33212193fd4fe..ae65ab4144668e1cb7ca24a8f4e56e659ee29f8d 100644 (file)
--- a/src/update/utils.c
+++ b/src/update/utils.c
@@ -22,13 +22,7 @@ RCSID
 #include <WINNT/afssw.h>
 #endif
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/usd/usd_file.c b/src/usd/usd_file.c
index b9c73cfddac3172dffe7adc969568e34c8bc54c8..93279b43fdeb4b3c5b0d1d127fc95c3b1989d08b 100644 (file)
--- a/src/usd/usd_file.c
+++ b/src/usd/usd_file.c
@@ -31,13 +31,7 @@ RCSID
 #include <sys/mtio.h>
 #endif /* AFS_AIX_ENV */
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <stdlib.h>
 
 #include <afs/debug.h>

diff --git a/src/uss/grammar.y b/src/uss/grammar.y
index 697a14d5fa5edca25fa2ab4e5866e4cf793f38ab..a14828c43e439f776afae99d56d6631eb41906e2 100644 (file)
--- a/src/uss/grammar.y
+++ b/src/uss/grammar.y
@@ -11,14 +11,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 #include <stdio.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 extern int line;
 extern int uss_perr;

diff --git a/src/uss/lex.l b/src/uss/lex.l
index 1c26d3fa4e19a8b526c2abf9a2efb2f60f918811..c96ecec3a6fddd643ee9124b117834f5be98a135 100644 (file)
--- a/src/uss/lex.l
+++ b/src/uss/lex.l
@@ -14,13 +14,7 @@
 RCSID("$Header$");
 
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include "y.tab.h"
 #include "uss_common.h"

diff --git a/src/uss/uss.c b/src/uss/uss.c
index 0c6f2d6828e3328889606fc05720c21615719c25..a0759e9143619dd3ecdb2c95ed91aa1d26ba877a 100644 (file)
--- a/src/uss/uss.c
+++ b/src/uss/uss.c
@@ -25,13 +25,7 @@ RCSID
 #include <signal.h>
 #endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include "uss_common.h"                /*Common uss definitions, globals */
 #include "uss_procs.h"         /*Main uss operations */

diff --git a/src/uss/uss_acl.c b/src/uss/uss_acl.c
index 00737070b83556b41b7cf7c671f71d69e5383d4c..7347426959054488b2313125851016fd9a883c56 100644 (file)
--- a/src/uss/uss_acl.c
+++ b/src/uss/uss_acl.c
@@ -30,13 +30,7 @@ RCSID
 #include <netdb.h>
 #include <errno.h>
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #undef VIRTUE
 #undef VICE

diff --git a/src/uss/uss_common.c b/src/uss/uss_common.c
index 347e4f5114600fd1905b5a47b2ab4b11bd16ba26..7cf2a9915bf8b388bf8dda35b31aee3078db7708 100644 (file)
--- a/src/uss/uss_common.c
+++ b/src/uss/uss_common.c
@@ -24,14 +24,7 @@ RCSID
 #include "uss_common.h"                /*Interface definitions */
 #include <afs/kautils.h>       /*MAXKTCREALMLEN & MAXKTCNAMELEN */
 
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 
 /*

diff --git a/src/uss/uss_common.h b/src/uss/uss_common.h
index 3b2f4ec40191dd8ae3b81b5f29e15dc9a15334e3..ecfc630f74216b57d104897d2f0718e10dd4bab3 100644 (file)
--- a/src/uss/uss_common.h
+++ b/src/uss/uss_common.h
@@ -23,13 +23,7 @@
 #include <stdio.h>             /*I/O stuff */
 #include <afs/afsutil.h>
 #include <errno.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 /*
  * --------------------- Exported definitions ---------------------

diff --git a/src/uss/uss_fs.c b/src/uss/uss_fs.c
index 232e76fcdf2b11173ded7b267db3a737e956299f..974992882ed74bb71ff4f7662b5bf823d5f7d91e 100644 (file)
--- a/src/uss/uss_fs.c
+++ b/src/uss/uss_fs.c
@@ -30,13 +30,7 @@ RCSID
 #endif
 #include <netinet/in.h>
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include <afs/venus.h>
 #include "uss_common.h"

diff --git a/src/uss/uss_kauth.c b/src/uss/uss_kauth.c
index cd82d33c241d12bb6c9f58eebab5eb61ae61d6c7..d7350882835230ed7e2d1dbc8b57eb4c488377fd 100644 (file)
--- a/src/uss/uss_kauth.c
+++ b/src/uss/uss_kauth.c
@@ -26,13 +26,7 @@ RCSID
 #include <errno.h>
 #include <pwd.h>
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include <afs/com_err.h>
 #include <afs/kautils.h> /*MAXKTCREALMLEN*/

diff --git a/src/uss/uss_procs.c b/src/uss/uss_procs.c
index e21cc64392b57d2cb47c84aa9ed5aab7ae654e8b..df9f49a128b21a4d86bfb328f0c2ed99b1f7ec8b 100644 (file)
--- a/src/uss/uss_procs.c
+++ b/src/uss/uss_procs.c
@@ -33,13 +33,7 @@ RCSID
 #include <fcntl.h>
 #endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include <afs/kautils.h> /*MAXKTCREALMLEN*/
 #undef USS_PROCS_DB

diff --git a/src/uss/uss_vol.c b/src/uss/uss_vol.c
index 0cc43fdacd99d878aebef079d35b2cc39a24fcc3..184917ad9a3b380afba3273ceae280e2920c0d88 100644 (file)
--- a/src/uss/uss_vol.c
+++ b/src/uss/uss_vol.c
@@ -30,13 +30,7 @@ RCSID
 #include <netdb.h>
 #include <errno.h>
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include <afs/vlserver.h>
 #include <afs/auth.h>

diff --git a/src/util/assert.c b/src/util/assert.c
index 1c59ef8cdac9c3614c7354a4873d0d57b3efc2c5..abfa6cae978c56d721ae0e5bf9db0eca8106ea22 100644 (file)
--- a/src/util/assert.c
+++ b/src/util/assert.c
@@ -14,13 +14,7 @@
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 RCSID
     ("$Header$");

diff --git a/src/util/casestrcpy.c b/src/util/casestrcpy.c
index 4645d1f3b1d89b38b7dfe93de4ef73db1c4db951..8e8e0ce52dd602ec60a50fc243654136a688fa47 100644 (file)
--- a/src/util/casestrcpy.c
+++ b/src/util/casestrcpy.c
@@ -13,13 +13,7 @@
 RCSID
     ("$Header$");
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <ctype.h>
 #include <stddef.h>
 #include <stdarg.h>

diff --git a/src/util/fileutil.c b/src/util/fileutil.c
index 8ff9449ac3dc0fa8f2b992ab91c119fd1b7c5849..e7e0c2d5f92acdea853f802db03221a3229a0172 100644 (file)
--- a/src/util/fileutil.c
+++ b/src/util/fileutil.c
@@ -20,6 +20,7 @@ RCSID
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
+#include <string.h>
 
 #ifdef AFS_NT40_ENV
 #include <windows.h>
@@ -30,13 +31,6 @@ RCSID
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <sys/types.h>
 #include <dirent.h>
 #include <sys/stat.h>

diff --git a/src/util/get_krbrlm.c b/src/util/get_krbrlm.c
index 0c6769a1270e3dd84dcb67fdfb0c7b1164718d05..55087059066e1450a3ebc79f998e9a09a9a81991 100644 (file)
--- a/src/util/get_krbrlm.c
+++ b/src/util/get_krbrlm.c
@@ -10,6 +10,8 @@ RCSID
     ("$Header$");
 
 #include <stdio.h>
+#include <string.h>
+#include <ctype.h>
 #include "afsutil.h"
 
 /*

diff --git a/src/util/hostparse.c b/src/util/hostparse.c
index d719756499840d9cf001061d464fde1f9713c430..ed0f44861b9202d95067a2a2eb5429834113b670 100644 (file)
--- a/src/util/hostparse.c
+++ b/src/util/hostparse.c
@@ -34,13 +34,7 @@ RCSID
 #include <netdb.h>
 #include <ctype.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <errno.h>
 #include "afsutil.h"
 #endif /* UKERNEL */

diff --git a/src/util/kreltime.c b/src/util/kreltime.c
index 1ed7e730d6850fc2f9cf87a3e4b9b00bd6c25d0c..e89775a7ba011d5e965b3b51609f547c2ef75d16 100644 (file)
--- a/src/util/kreltime.c
+++ b/src/util/kreltime.c
@@ -19,13 +19,7 @@ RCSID
 #include "ktime.h"
 #include <time.h>
 #include <ctype.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include "afsutil.h"
 
 

diff --git a/src/util/ktime.c b/src/util/ktime.c
index f113b4f0181fcef21439f77917c50c43e3690443..49e39458329346a9f60bf504f35906b25eb34b94 100644 (file)
--- a/src/util/ktime.c
+++ b/src/util/ktime.c
@@ -20,13 +20,7 @@ RCSID
 #ifdef AFS_NT40_ENV
 #include <malloc.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <stdlib.h>
 #include "afsutil.h"
 

diff --git a/src/util/netutils.c b/src/util/netutils.c
index 4ff10a027220a193b1ea178760cd9e55c86632d7..ab1734499bdc8f73d86ee9484921c40f5850bf43 100644 (file)
--- a/src/util/netutils.c
+++ b/src/util/netutils.c
@@ -24,13 +24,7 @@ RCSID
 
 #include <stdlib.h>
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <ctype.h>
 #ifdef KERNEL
 #include "afs/sysincludes.h"

diff --git a/src/util/serverLog.c b/src/util/serverLog.c
index 9b47aada461162e85297a52daf0c17d5d80a7886..bfd09983ac459ace3ac8f3eb8136ed13fc9c9ad3 100644 (file)
--- a/src/util/serverLog.c
+++ b/src/util/serverLog.c
@@ -37,13 +37,7 @@ RCSID
 #include <afs/procmgmt.h>      /* signal(), kill(), wait(), etc. */
 #include <fcntl.h>
 #include <afs/stds.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <sys/stat.h>
 #include "afsutil.h"
 #include "fileutil.h"

diff --git a/src/util/snprintf.c b/src/util/snprintf.c
index 603d174d6e172dbc5370dd442c2a4d8b4028ee38..bf5368d68d03bdcfe57958db63e7ca8dd3a7db53 100644 (file)
--- a/src/util/snprintf.c
+++ b/src/util/snprintf.c
@@ -10,6 +10,7 @@ RCSID
 #include <stdarg.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <string.h>
 #ifndef AFS_NT40_ENV
 #include <netinet/in.h>
 #include <netdb.h>
@@ -19,13 +20,6 @@ RCSID
 #if defined(AFS_AIX32_ENV) || defined(AFS_SUN_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_SGI65_ENV)
 #include <sys/socket.h>
 #endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #define MAXPREC 100
 

diff --git a/src/util/uuid.c b/src/util/uuid.c
index 593a79a37cb3480b690a19771a20f9cd34bdc5aa..3972aaab332e4bd31a857991aad555269fd58198 100644 (file)
--- a/src/util/uuid.c
+++ b/src/util/uuid.c
@@ -60,6 +60,7 @@ RCSID
 #else /* KERNEL */
 #include <stdio.h>
 #include <errno.h>
+#include <string.h>
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
 #include <process.h>
@@ -73,13 +74,6 @@ RCSID
 #include <sys/time.h>
 #endif /* ITIMER_REAL */
 #include <net/if.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/util/volparse.c b/src/util/volparse.c
index 1ae83d1671f8732bb2e19cc187320fe08dc9c962..a358da784dbaab1b2b48a2051c5bf795a2f42c04 100644 (file)
--- a/src/util/volparse.c
+++ b/src/util/volparse.c
@@ -13,13 +13,7 @@
 RCSID
     ("$Header$");
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif

diff --git a/src/venus/cmdebug.c b/src/venus/cmdebug.c
index b20b1818be88ab894fe3a85ee8c456155cec4ea0..c7d04182ecf546157a5e0c20a6940205362dfb14 100644 (file)
--- a/src/venus/cmdebug.c
+++ b/src/venus/cmdebug.c
@@ -26,13 +26,7 @@ RCSID
 #include <netdb.h>
 #endif
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef AFS_AIX32_ENV
 #include <signal.h>
 #endif

diff --git a/src/venus/fs.c b/src/venus/fs.c
index fe23dbeb8531ecc6cbb785f4de8d0253e596c0fe..736309563c857610a9d5442253dad857a4910ddd 100644 (file)
--- a/src/venus/fs.c
+++ b/src/venus/fs.c
@@ -29,13 +29,7 @@ RCSID
 #include <signal.h>
 #endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #undef VIRTUE
 #undef VICE

diff --git a/src/venus/fstrace.c b/src/venus/fstrace.c
index b627fba5c64f4c2266e0ece5016121a826be4778..fc6e4ce5965ed5b984d451b914af40c65c98e2f4 100644 (file)
--- a/src/venus/fstrace.c
+++ b/src/venus/fstrace.c
@@ -27,13 +27,7 @@ RCSID
 #undef abs
 #include <stdlib.h>
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include <afs/stds.h>
 #include <afs/cmd.h>

diff --git a/src/venus/livesys.c b/src/venus/livesys.c
index d447891717c3dd20bdde70640c1c3c699bc508a0..d1dee53e2bb4e9774948d184687afe742aceb7e0 100644 (file)
--- a/src/venus/livesys.c
+++ b/src/venus/livesys.c
@@ -22,13 +22,7 @@ RCSID
 #include <stdio.h>
 #include <netinet/in.h>
 #include <sys/stat.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <afs/stds.h>
 #include <afs/vice.h>
 #include <afs/venus.h>

diff --git a/src/venus/up.c b/src/venus/up.c
index b8305ea9cc8ec7f743365936bfc5ca700404a92a..ea1b29c28e1d9fbd336fce8ddf6e16bbcfb8e48e 100644 (file)
--- a/src/venus/up.c
+++ b/src/venus/up.c
@@ -45,13 +45,7 @@ RCSID
 #include <netinet/in.h>
 #endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include <afs/venus.h>
 

diff --git a/src/vfsck/dirutils.c b/src/vfsck/dirutils.c
index f893326878f9aef9ab58cb2a710af687a46b6a98..9b3246695e370b7014d6802d13c03300c05db734 100644 (file)
--- a/src/vfsck/dirutils.c
+++ b/src/vfsck/dirutils.c
@@ -15,6 +15,7 @@ RCSID
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <string.h>
 #include <dirent.h>
 #include <afs/partition.h>
 

diff --git a/src/vfsck/setup.c b/src/vfsck/setup.c
index 19d7dce0834d2ba72eca17d5f4664023dea69af6..87a99d2036e55b2e9a701a70c5166e7f2cfcd00c 100644 (file)
--- a/src/vfsck/setup.c
+++ b/src/vfsck/setup.c
@@ -22,6 +22,7 @@ RCSID
     ("$Header$");
 
 #include <stdio.h>
+#include <string.h>
 #define VICE
 
 #if    defined(AFS_SUN_ENV) || defined(AFS_OSF_ENV)

diff --git a/src/vfsck/utilities.c b/src/vfsck/utilities.c
index 27ea70706d9877cd7a48aa128b039a3dc4b5d18d..4d42aa4947eb96d96fd00a8661cf049b1ca49212 100644 (file)
--- a/src/vfsck/utilities.c
+++ b/src/vfsck/utilities.c
@@ -75,6 +75,7 @@ RCSID
 #endif /* AFS_OSF_ENV */
 
 #include <stdio.h>
+#include <string.h>
 #include <ctype.h>
 #include "fsck.h"
 

diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index e55e87b554626158dfd3d1a410ecdf8c3a200f76..695170ae60a1ed372562fac7852b08c46eeedbdf 100644 (file)
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -46,14 +46,7 @@ RCSID
 #include <netdb.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #ifndef AFS_LINUX20_ENV
 #include <net/if.h>

diff --git a/src/viced/callback.c b/src/viced/callback.c
index 3c7a62d31fb7cffe093864190eb3d632fe30ec4e..908de21c9e546883ccc7cbece828ae9c05b8a327 100644 (file)
--- a/src/viced/callback.c
+++ b/src/viced/callback.c
@@ -88,6 +88,7 @@ RCSID
 #include <stdio.h>
 #include <stdlib.h>            /* for malloc() */
 #include <time.h>              /* ANSI standard location for time stuff */
+#include <string.h>
 #ifdef AFS_NT40_ENV
 #include <fcntl.h>
 #include <io.h>
@@ -95,13 +96,6 @@ RCSID
 #include <sys/time.h>
 #include <sys/file.h>
 #endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <afs/assert.h>
 
 #include <afs/stds.h>

diff --git a/src/viced/fsprobe.c b/src/viced/fsprobe.c
index 04a1c04076d9404d4dfb92a64ae639ff95e005f4..3d764cafb03f74f5f2ebe53c8043e77f4d05bc9d 100644 (file)
--- a/src/viced/fsprobe.c
+++ b/src/viced/fsprobe.c
@@ -20,15 +20,7 @@ RCSID
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <ubik.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 
 struct ubik_client *cstruct;
 struct rx_connection *serverconns[MAXSERVERS];

diff --git a/src/viced/host.c b/src/viced/host.c
index 9476f9854e9189faf106d67e69b6dd9d33f537ca..b78745a4fa59df48cfd8f663395f664333449d44 100644 (file)
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -15,6 +15,7 @@ RCSID
 
 #include <stdio.h>
 #include <errno.h>
+#include <string.h>
 #ifdef AFS_NT40_ENV
 #include <fcntl.h>
 #include <winsock2.h>
@@ -24,14 +25,6 @@ RCSID
 #include <netinet/in.h>
 #endif
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include <afs/stds.h>
 #include <rx/xdr.h>
 #include <afs/assert.h>

diff --git a/src/viced/physio.c b/src/viced/physio.c
index b3a6a16ff33f138dc50ade5ed9e8e978d388ac83..678e2bd677dff7560f784230de4368ae6feb18a4 100644 (file)
--- a/src/viced/physio.c
+++ b/src/viced/physio.c
@@ -21,6 +21,7 @@ RCSID
 
 #include <stdio.h>
 #include <errno.h>
+#include <string.h>
 #ifdef AFS_NT40_ENV
 #include <fcntl.h>
 #else
@@ -28,13 +29,6 @@ RCSID
 #include <sys/time.h>
 #include <unistd.h>
 #endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <afs/nfs.h>
 #include <afs/assert.h>
 #include <lwp.h>

diff --git a/src/viced/viced.c b/src/viced/viced.c
index 18e960814b824e042d4c548542588bcd4c757823..d0fc8602108a138b2268072d76e388f4ab173616 100644 (file)
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -25,6 +25,7 @@ RCSID
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <string.h>
 #include <sys/types.h>
 #include <afs/procmgmt.h>      /* signal(), kill(), wait(), etc. */
 #include <sys/stat.h>
@@ -39,14 +40,6 @@ RCSID
 #include <netdb.h>
 #include <unistd.h>            /* sysconf() */
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #ifndef ITIMER_REAL
 #include <sys/time.h>
 #endif /* ITIMER_REAL */

diff --git a/src/vlserver/cnvldb.c b/src/vlserver/cnvldb.c
index dbe42d5aa92442f13635407de81c3968410b3a9a..237d0fd7a8cbad2072e5db8583a2df16ac0e6aba 100644 (file)
--- a/src/vlserver/cnvldb.c
+++ b/src/vlserver/cnvldb.c
@@ -18,14 +18,7 @@ RCSID
 #include <errno.h>
 #include <stdio.h>
 #include <sys/file.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include "cnvldb.h"            /* CHANGEME! */
 #include <netinet/in.h>

diff --git a/src/vlserver/vlclient.c b/src/vlserver/vlclient.c
index 42d70c0c9a8340b157394fc35489849a9b26c3e5..3ef0e47f5e17dc8c27288516dca7809db82a9874 100644 (file)
--- a/src/vlserver/vlclient.c
+++ b/src/vlserver/vlclient.c
@@ -38,14 +38,7 @@ RCSID
 #include <netinet/in.h>
 #endif
 #include <stdio.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include <afs/afsutil.h>
 #include <rx/xdr.h>

diff --git a/src/vlserver/vldb_check.c b/src/vlserver/vldb_check.c
index 8697d5375b58ab373cba72d985712e2a18b728ea..7177beba96576991b7855a49b99ea28417b93915 100644 (file)
--- a/src/vlserver/vldb_check.c
+++ b/src/vlserver/vldb_check.c
@@ -39,6 +39,7 @@ RCSID
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <string.h>
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
 #include <WINNT/afsevent.h>
@@ -49,14 +50,6 @@ RCSID
 #include <netinet/in.h>
 #endif
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include "vlserver.h"
 #include "vldbint.h"
 #include <ubik.h>

diff --git a/src/vlserver/vlprocs.c b/src/vlserver/vlprocs.c
index 97c8afb1336dd3518ab94b54ece1b86a1ac0eca7..486f7907fa5b24235f2f3776ce5a6bd5ad8a81be 100644 (file)
--- a/src/vlserver/vlprocs.c
+++ b/src/vlserver/vlprocs.c
@@ -15,6 +15,7 @@ RCSID
 
 #include <sys/types.h>
 #include <stdio.h>
+#include <string.h>
 #include <lock.h>
 #include <afs/afsutil.h>
 #include <ubik.h>
@@ -25,13 +26,6 @@ RCSID
 #else
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <afs/keys.h>
 #include "vlserver.h"
 #include "afs/audit.h"

diff --git a/src/vlserver/vlserver.c b/src/vlserver/vlserver.c
index 280086769136ec1e28c9398aa6a3ca5b884d019e..0b4e307512a4195484afd87f0d8371598b28e1a7 100644 (file)
--- a/src/vlserver/vlserver.c
+++ b/src/vlserver/vlserver.c
@@ -17,6 +17,7 @@ RCSID
 #include <sys/types.h>
 #include <signal.h>
 #include <sys/stat.h>
+#include <string.h>
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
@@ -36,14 +37,6 @@ RCSID
 #endif
 #include <stdio.h>
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <rx/rx_globals.h>

diff --git a/src/vlserver/vlutils.c b/src/vlserver/vlutils.c
index 3eb2b454ec7fa1550a3fe300e173e2e6139d5b47..ce6a9a4aa30e1fe82aba95e284e55a19c496227a 100644 (file)
--- a/src/vlserver/vlutils.c
+++ b/src/vlserver/vlutils.c
@@ -14,20 +14,13 @@ RCSID
     ("$Header$");
 
 #include <sys/types.h>
+#include <string.h>
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
 #else
 #include <netinet/in.h>
 #endif
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include <lock.h>
 #include <rx/xdr.h>
 #include <ubik.h>

diff --git a/src/vol/clone.c b/src/vol/clone.c
index a91a10789b891823014e14d6d7b2056c4d343d2f..114171907909b76e16ca27dca599693f438bc4a6 100644 (file)
--- a/src/vol/clone.c
+++ b/src/vol/clone.c
@@ -38,13 +38,7 @@ RCSID
 #include <sys/file.h>
 #include <sys/time.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <errno.h>
 #include <sys/stat.h>
 

diff --git a/src/vol/devname.c b/src/vol/devname.c
index f614bc3b90c2b2bf7f2ed13a223238aafb6ff7c9..c06544a611e5ba7aea97d532eb3757fb333784cd 100644 (file)
--- a/src/vol/devname.c
+++ b/src/vol/devname.c
@@ -16,6 +16,7 @@ RCSID
 #include <afs/param.h>
 #include <rx/xdr.h>
 #include <afs/afsint.h>
+#include <string.h>
 #include <ctype.h>
 #if !defined(AFS_SGI_ENV)
 #ifdef AFS_OSF_ENV
@@ -87,16 +88,6 @@ RCSID
 #endif /* ITIMER_REAL */
 #include "partition.h"
 
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
-
 /* ensure that we don't have a "/" instead of a "/dev/rxd0a" type of device.
  * returns pointer to static storage; copy it out quickly!
  */

diff --git a/src/vol/ihandle.c b/src/vol/ihandle.c
index c502d339ff046e58b43a7af56706215f9044cb3a..fa235fdda31ec2618644b51c4af62f9c843741ca 100644 (file)
--- a/src/vol/ihandle.c
+++ b/src/vol/ihandle.c
@@ -20,6 +20,7 @@ RCSID
 #include <stdio.h>
 #include <sys/types.h>
 #include <errno.h>
+#include <string.h>
 #ifdef AFS_NT40_ENV
 #include <fcntl.h>
 #else
@@ -31,13 +32,7 @@ RCSID
 #include <sys/resource.h>
 #endif
 #endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
+
 #include <rx/xdr.h>
 #include <afs/afsint.h>
 #include <errno.h>

diff --git a/src/vol/listinodes.c b/src/vol/listinodes.c
index 8342b1967681d7150d5e97ac573b0b0f2163ba37..b2789c8d0d7efaf9e8d2e381be8c990d7491f051 100644 (file)
--- a/src/vol/listinodes.c
+++ b/src/vol/listinodes.c
@@ -20,6 +20,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <string.h>
+
 RCSID
     ("$Header$");
 

diff --git a/src/vol/partition.c b/src/vol/partition.c
index 748975a380a05213ce76ea0d0825e65656e4d3d3..5cd300d0d6fe3377e821dc0e73e19f97668c66d7 100644 (file)
--- a/src/vol/partition.c
+++ b/src/vol/partition.c
@@ -24,6 +24,7 @@ RCSID
     ("$Header$");
 
 #include <ctype.h>
+#include <string.h>
 #ifdef AFS_NT40_ENV
 #include <windows.h>
 #include <winbase.h>
@@ -106,14 +107,6 @@ RCSID
 #include <mntent.h>
 #endif
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include <rx/xdr.h>
 #include <afs/afsint.h>
 #include "nfs.h"

diff --git a/src/vol/physio.c b/src/vol/physio.c
index ac3eeb4c642243e580f15451c6b42c0205b1ebc2..c463a4e7d4c0020697239b3012e56f7284b60ea5 100644 (file)
--- a/src/vol/physio.c
+++ b/src/vol/physio.c
@@ -28,13 +28,7 @@ RCSID
 #else
 #include <sys/file.h>
 #include <unistd.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef AFS_SUN5_ENV
 #include <sys/fcntl.h>
 #endif

diff --git a/src/vol/purge.c b/src/vol/purge.c
index b9057f71cc0a3851d81e70c730a6777ff32b6b9d..2f9811bf479c3b10f0410c2812b87af2467233e9 100644 (file)
--- a/src/vol/purge.c
+++ b/src/vol/purge.c
@@ -28,13 +28,7 @@ RCSID
 #include <sys/file.h>
 #include <sys/time.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <sys/stat.h>
 #include <afs/assert.h>
 

diff --git a/src/vol/vnode.c b/src/vol/vnode.c
index 3e4b45df46c3857ae708cbb4513e3e02c30d9993..72e87c8ae5fe345fbd901e4d6dbc5bc065c0f5b8 100644 (file)
--- a/src/vol/vnode.c
+++ b/src/vol/vnode.c
@@ -21,13 +21,7 @@ RCSID
 
 #include <errno.h>
 #include <stdio.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #else /* AFS_PTHREAD_ENV */

diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c
index 29f5fec2207e041fce3c5dc9de3ccaa0a25d5cbf..ec2641e40e6fff399579c53a9a61f360134a133e 100644 (file)
--- a/src/volser/dumpstuff.c
+++ b/src/volser/dumpstuff.c
@@ -17,6 +17,7 @@ RCSID
 #include <ctype.h>
 #include <stdio.h>
 #include <errno.h>
+#include <string.h>
 #ifdef AFS_NT40_ENV
 #include <fcntl.h>
 #else
@@ -26,13 +27,6 @@ RCSID
 #include <netinet/in.h>
 #include <unistd.h>
 #endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <sys/stat.h>
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>

diff --git a/src/volser/lockprocs.c b/src/volser/lockprocs.c
index e83eb6561aafbe06f7cf8a3ec691425694bea455..e312ff1350a82d2627a1377527e00de5f7512ddd 100644 (file)
--- a/src/volser/lockprocs.c
+++ b/src/volser/lockprocs.c
@@ -26,13 +26,7 @@ RCSID
 #else
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <afs/voldefs.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>

diff --git a/src/volser/physio.c b/src/volser/physio.c
index 31cac6523edf4c8dd302bb2e79d450fce01cd639..f285d74167d89b17bf9f9d8fe5736c4d56335af1 100644 (file)
--- a/src/volser/physio.c
+++ b/src/volser/physio.c
@@ -21,13 +21,7 @@ RCSID
 #include <netinet/in.h>
 #include <unistd.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #ifdef AFS_SUN5_ENV
 #include <sys/fcntl.h>
 #endif

diff --git a/src/volser/restorevol.c b/src/volser/restorevol.c
index 449e7d01b51e835819755fcee7cc69da83ee7937..c4041149b4919eb95f1035194cd7c3aa08c097fd 100644 (file)
--- a/src/volser/restorevol.c
+++ b/src/volser/restorevol.c
@@ -64,14 +64,7 @@ RCSID
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <dirent.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 
 char rootdir[MAXPATHLEN];

diff --git a/src/volser/volmain.c b/src/volser/volmain.c
index a83ad6bf73c525cbcdf41ea7269a7c16e0cc4421..837d93cab55ad71b3a2d8d60657c8c33f6c74400 100644 (file)
--- a/src/volser/volmain.c
+++ b/src/volser/volmain.c
@@ -14,6 +14,7 @@ RCSID
     ("$Header$");
 
 #include <sys/types.h>
+#include <string.h>
 #ifdef AFS_NT40_ENV
 #include <time.h>
 #include <fcntl.h>
@@ -24,13 +25,6 @@ RCSID
 #include <sys/file.h>
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <rx/xdr.h>
 #include <afs/afsint.h>
 #include <stdio.h>

diff --git a/src/volser/volprocs.c b/src/volser/volprocs.c
index 7aabab2cd0bab2f4ba42823569450e34773edb27..51218b27cdeed7e0bc7bbac8382c7e48a17dc060 100644 (file)
--- a/src/volser/volprocs.c
+++ b/src/volser/volprocs.c
@@ -15,6 +15,7 @@ RCSID
 
 #include <stdio.h>
 #include <sys/types.h>
+#include <string.h>
 #include <errno.h>
 #ifdef AFS_NT40_ENV
 #include <fcntl.h>
@@ -25,14 +26,6 @@ RCSID
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include <dirent.h>
 #include <sys/stat.h>
 #include <rx/xdr.h>

diff --git a/src/volser/voltrans.c b/src/volser/voltrans.c
index d95bb2fcac1f352f2616df204f41de48b854e55f..1966eaeb2206fe66d3770a1dde1d65d99b42a7ff 100644 (file)
--- a/src/volser/voltrans.c
+++ b/src/volser/voltrans.c
@@ -29,6 +29,7 @@ RCSID
 #include <stdio.h>
 #include <sys/types.h>
 #include <errno.h>
+#include <string.h>
 #ifdef AFS_NT40_ENV
 #include <fcntl.h>
 #include <winsock2.h>
@@ -62,14 +63,6 @@ RCSID
 #include <afs/vnode.h>
 #include <afs/volume.h>
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include "volser.h"
 
 /*@printflike@*/ extern void Log(const char *format, ...);

diff --git a/src/volser/vos.c b/src/volser/vos.c
index fcae41b121df45db20021b1d98882287a0d5b88e..145b34b16d08d6e1ee230762c0f24976bdb2f5e9 100644 (file)
--- a/src/volser/vos.c
+++ b/src/volser/vos.c
@@ -14,6 +14,7 @@ RCSID
     ("$Header$");
 
 #include <sys/types.h>
+#include <string.h>
 #ifdef AFS_NT40_ENV
 #include <fcntl.h>
 #include <io.h>
@@ -31,14 +32,6 @@ RCSID
 #endif
 #include <errno.h>
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include <lock.h>
 #include <afs/stds.h>
 #include <rx/xdr.h>

diff --git a/src/volser/vsprocs.c b/src/volser/vsprocs.c
index 0c960ca2cb2d2d00da6b34c6a568d8286ca7a9a7..7a4ba3a1b5c0a7a95a7b3b31a0a4626c84ba7bfc 100644 (file)
--- a/src/volser/vsprocs.c
+++ b/src/volser/vsprocs.c
@@ -16,6 +16,7 @@ RCSID
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <string.h>
 #ifdef AFS_AIX_ENV
 #include <sys/statfs.h>
 #endif
@@ -27,14 +28,6 @@ RCSID
 #include <netinet/in.h>
 #endif
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include <lock.h>
 #include <afs/voldefs.h>
 #include <rx/xdr.h>

diff --git a/src/volser/vsutils.c b/src/volser/vsutils.c
index 6cec711cf537b86d68b707bfa105fdf01a411c6a..afa58ec034df6d3dd9ae99ca703bbcedd7bf537e 100644 (file)
--- a/src/volser/vsutils.c
+++ b/src/volser/vsutils.c
@@ -14,6 +14,7 @@ RCSID
     ("$Header$");
 
 #include <afs/stds.h>
+#include <string.h>
 #ifdef AFS_NT40_ENV
 #include <fcntl.h>
 #include <winsock2.h>
@@ -28,14 +29,6 @@ RCSID
 #include <sys/statfs.h>
 #endif
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include <errno.h>
 #include <lock.h>
 #include <rx/xdr.h>

diff --git a/src/xstat/xstat_cm.c b/src/xstat/xstat_cm.c
index 109df3d4839b9a322cb53c31f60ba4db309b4a41..c049ed373156b2d2ed96993c03c1076421793ba7 100644 (file)
--- a/src/xstat/xstat_cm.c
+++ b/src/xstat/xstat_cm.c
@@ -24,14 +24,7 @@ RCSID
 #include <lwp.h>               /*Lightweight process package */
 
 #include <afs/afsutil.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #define LWP_STACK_SIZE (16 * 1024)
 

diff --git a/src/xstat/xstat_cm_test.c b/src/xstat/xstat_cm_test.c
index f93702b22fa866500c1073357351d91041a1aeed..6c51cce9b9bfca8a2c3ee822241e1a3dda46af69 100644 (file)
--- a/src/xstat/xstat_cm_test.c
+++ b/src/xstat/xstat_cm_test.c
@@ -22,13 +22,7 @@ RCSID
 #include "xstat_cm.h"          /*Interface for xstat_cm module */
 #include <cmd.h>               /*Command line interpreter */
 #include <time.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 /*
  * External routines that don't have explicit include file definitions.

diff --git a/src/xstat/xstat_fs.c b/src/xstat/xstat_fs.c
index a3f7b67b424063afdc094afc5de82f1f7b149abd..2805b1207d7255be806e11d27b834f9a3d3c2ad0 100644 (file)
--- a/src/xstat/xstat_fs.c
+++ b/src/xstat/xstat_fs.c
@@ -24,14 +24,7 @@ RCSID
 #include <lwp.h>               /*Lightweight process package */
 
 #include <afs/afsutil.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #define LWP_STACK_SIZE (16 * 1024)
 

diff --git a/src/xstat/xstat_fs_callback.c b/src/xstat/xstat_fs_callback.c
index e427e845f6d6724edc2bc0107e846ca6eaa6f7e8..c1f78b0004be849d7ba83ef62c9a162460331cf4 100644 (file)
--- a/src/xstat/xstat_fs_callback.c
+++ b/src/xstat/xstat_fs_callback.c
@@ -34,14 +34,7 @@ RCSID
 
 #include <errno.h>
 #include <stdio.h>             /*Standard I/O stuff */
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #include <afs/afscbint.h>      /*Callback interface defs */
 

diff --git a/src/xstat/xstat_fs_test.c b/src/xstat/xstat_fs_test.c
index 80cdfed6390669a5eaf932c241f8fa3aecc1d203..c922c13c7360d487d9ee40ba1dc7217ef76cfc8a 100644 (file)
--- a/src/xstat/xstat_fs_test.c
+++ b/src/xstat/xstat_fs_test.c
@@ -22,13 +22,7 @@ RCSID
 #include "xstat_fs.h"          /*Interface for xstat_fs module */
 #include <cmd.h>               /*Command line interpreter */
 #include <time.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 /*
  * External routines that don't have explicit include file definitions.