openafs-string-header-cleanup-20071030

include only what we need

diff --git a/src/afsd/vsys.c b/src/afsd/vsys.c
index 424eb1b..a36b5cd 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 5ab39e4..8f2f2f8 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 e54d17f..6a564b4 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 0cb0374..4b0cd02 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/aklog/klog.c b/src/aklog/klog.c
index 67d5a29..e85df9a 100644 (file)
--- a/src/aklog/klog.c
+++ b/src/aklog/klog.c
@@ -16,13 +16,7 @@
 #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 <errno.h>
 
 #include <lock.h>

diff --git a/src/auth/authcon.c b/src/auth/authcon.c
index aff1106..c57abee 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 7398c03..761132a 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 96a5e59..e1a592d 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 805ef25..6770b14 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 edefbd6..2999281 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 c947158..153bc56 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 0ebdfb3..f6facc3 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 b6e992f..c29b797 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 9d368ca..a9b1b29 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 7fecb2c..6657cd2 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 7852d9c..b55ab1e 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 7e3a467..f06eb39 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 4e385e2..4fbc1bf 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 42c4f43..56797f6 100644 (file)
--- a/src/budb/database.c
+++ b/src/budb/database.c
@@ -26,15 +26,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 fbed0a6..4ac984a 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 587fde4..8c5a614 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 16a0636..d9b9897 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 8876612..9ce5b9b 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/bubasics.h>

diff --git a/src/budb/ol_verify.c b/src/budb/ol_verify.c
index 7af3276..741630e 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 9524e1b..2ad1be0 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 3a2f83e..2a8f11c 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 5da1ba1..1388441 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 5f5b95f..56562e4 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 038d5bc..df33590 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 0f4aee8..a99d0be 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 fe40c8a..dd51fa6 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 89b01ba..1f904b1 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 79c0c53..08cbfb9 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 4e0a754..eebac7f 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 e6b71ab..4458aa2 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 9a75a2c..9e451ba 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 c32f149..0e3647d 100644 (file)
--- a/src/dir/dir.c
+++ b/src/dir/dir.c
@@ -99,13 +99,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 f499a05..4b867e0 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 863a043..f512aec 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 bff804d..5951e04 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 a1d351b..601dc2b 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 983226f..a0b5fc0 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 68877ac..5277c01 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 e6c0100..93dedcf 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 4feaf1a..db9e698 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 1ca8fac..8629970 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 5bc5d65..3b095e6 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 5c7bc33..9cdd08b 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 86d7b1f..9d99966 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 6c0a180..eea34ea 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 aef045d..507500a 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 c3bee37..a1e6580 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 0081e9c..a2e7c07 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 f70bed5..2fe208d 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 8ecfa61..ca75c53 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 2b5e9a9..62e1925 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 2a43c4f..21ee9d7 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 c82ac7d..2028dc7 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 68f08e5..6f4a982 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 211b2f7..f1d3d54 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 e42ed95..703a5b6 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 2109056..7d577af 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 c7d3a0b..94d8ddd 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 0cac47a..28f4053 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 c9641a8..ad4aac0 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 7a126bb..d28e3c7 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 f53730a..7a188d7 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 2436741..03a3fd4 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 ed7f21e..6ad03a7 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 3d2aadd..339887b 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 468b725..d3bbdce 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 f46764b..07286a1 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 d4d230e..b8ed0af 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 3b25040..0632411 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 0eb31bd..6c7bc35 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 9c14c13..15d1701 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 5234a26..bc72dfd 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 f74602c..878920d 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 f7d19cb..490ae8e 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 703954d..d42df10 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 2946735..70dd377 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 ba4939d..44eb712 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 2b7649c..71a4b40 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 f36b317..3f7e9be 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 af7ca81..4b5abea 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 c1f7023..d36bd54 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 56bbd91..ec43656 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>
 #ifdef AFS_AIX51_ENV
 #include <sys/cred.h>

diff --git a/src/ptserver/db_verify.c b/src/ptserver/db_verify.c
index 62c5f2c..9d321f5 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 4ac88b4..4126831 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 d32aee0..a79201a 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 8878fc0..778eba6 100644 (file)
--- a/src/ptserver/ptserver.c
+++ b/src/ptserver/ptserver.c
@@ -129,13 +129,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 8a835f7..7635319 100644 (file)
--- a/src/ptserver/ptuser.c
+++ b/src/ptserver/ptuser.c
@@ -40,13 +40,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 <afs/auth.h>

diff --git a/src/ptserver/ptutils.c b/src/ptserver/ptutils.c
index f7ad70d..3c2b83b 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 52300ae..954ba31 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 9b9870e..3131b0b 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 064cf54..ab9f408 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 1739c94..a68a825 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 5040737..ee01ac3 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 df35abc..a4361ab 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>
@@ -93,13 +94,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 69ddc5b..fde2618 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 a94cddb..f5cc949 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 a03a5a0..d633475 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 91d14a6..2e3bf0f 100644 (file)
--- a/src/rx/rx_rdwr.c
+++ b/src/rx/rx_rdwr.c
@@ -81,13 +81,7 @@ RCSID
 # include <sys/stat.h>
 # include <sys/time.h>
 #endif /* !AFS_NT40_ENV */
-#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 dfb1735..ac7a6e6 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 bd59a87..e2238c1 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 5816ef1..54011e6 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 41776ec..03d8947 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 0a84fac..ad14646 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 9145eb6..f8aa058 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 a42f5c7..01af04f 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 66599be..92a8645 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 2ac8b4f..c223d2f 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 fafc81b..873e308 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 2fd4f17..7504bfd 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 6e717f6..288e6ea 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 9794442..232c1fb 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 a7e93fc..65a4827 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 f827e04..6d94ddb 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 0a01f1f..efd5613 100644 (file)
--- a/src/rxkad/domestic/fcrypt.c
+++ b/src/rxkad/domestic/fcrypt.c
@@ -45,6 +45,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 6844caf..4c61fc1 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 397023b..0e9fcf2 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 1f83e2c..6b34e0b 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 d71cd33..0d1351d 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 de57519..09adcb9 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 e8300b9..54bb3cd 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 126721c..cd7425f 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 7b5995d..c408e36 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 095efaa..e0a93e9 100644 (file)
--- a/src/sys/pagsh.c
+++ b/src/sys/pagsh.c
@@ -25,9 +25,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 6d501af..f37b878 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 907f93f..c879e73 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 33bb05a..3e20624 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/tviced/serialize_state.c b/src/tviced/serialize_state.c
index 6239198..1cea24c 100644 (file)
--- a/src/tviced/serialize_state.c
+++ b/src/tviced/serialize_state.c
@@ -21,6 +21,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>
@@ -28,13 +29,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 <sys/stat.h>
 

diff --git a/src/tviced/state_analyzer.c b/src/tviced/state_analyzer.c
index f9cb8be..1919030 100644 (file)
--- a/src/tviced/state_analyzer.c
+++ b/src/tviced/state_analyzer.c
@@ -26,14 +26,7 @@ RCSID
 #include <netdb.h>
 #include <netinet/in.h>
 #include <time.h>
-
-#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>

diff --git a/src/ubik/beacon.c b/src/ubik/beacon.c
index d5b1526..3823109 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 ee8a149..e29f865 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 caf84aa..2611056 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 7c86de9..a04a059 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 1fc8448..ff0b30b 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 2fad57a..87beebd 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 cf16f10..06cfca3 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 451d5fc..3412d7d 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 23f4401..da61e60 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 3852bd1..9387a35 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 f832c26..eab0cef 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 0a1f4f2..d61ef05 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 b176aac..d88eb2e 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 a0689c8..f66edc0 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 13d6b86..ae65ab4 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 b9c73cf..93279b4 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 697a14d..a14828c 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 1c26d3f..c96ecec 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 0c6f2d6..a0759e9 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 0073707..7347426 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 347e4f5..7cf2a99 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 3b2f4ec..ecfc630 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 232e76f..9749928 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 cd82d33..d735088 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 e21cc64..df9f49a 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 b20ba4d..4b80876 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 757d976..d953eaf 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 4645d1f..8e8e0ce 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 8ff9449..e7e0c2d 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 2f9e7d2..21950b9 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 2de6080..d48dc6d 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 1ed7e73..e89775a 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 cf082f0..8125646 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 4ff10a0..ab17344 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 e549517..62bc1da 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 8387257..ca511a1 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 593a79a..3972aaa 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 1ae83d1..a358da7 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 d22ab73..f6b7b44 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 60709b5..926fb8e 100644 (file)
--- a/src/venus/fs.c
+++ b/src/venus/fs.c
@@ -30,13 +30,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 ef5dd1f..8d8f21e 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 ea121e7..d7202a1 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 2dee7cf..63765b7 100644 (file)
--- a/src/venus/up.c
+++ b/src/venus/up.c
@@ -42,13 +42,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 f893326..9b32466 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 19d7dce..87a99d2 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 27ea707..4d42aa4 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 f879b5d..fa26512 100644 (file)
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -47,14 +47,7 @@ RCSID
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.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 a9e81f6..82bdce2 100644 (file)
--- a/src/viced/callback.c
+++ b/src/viced/callback.c
@@ -90,6 +90,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>
@@ -97,13 +98,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 7e65686..d65990f 100644 (file)
--- a/src/viced/fsprobe.c
+++ b/src/viced/fsprobe.c
@@ -21,15 +21,7 @@ RCSID
 #include <arpa/inet.h>
 #include <netdb.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 feb9bec..aea2c08 100644 (file)
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -17,6 +17,7 @@ RCSID
 
 #include <stdio.h>
 #include <errno.h>
+#include <string.h>
 #ifdef AFS_NT40_ENV
 #include <fcntl.h>
 #include <winsock2.h>
@@ -26,14 +27,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 b3a6a16..678e2bd 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 5d6cf5f..68533f7 100644 (file)
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -27,6 +27,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>
@@ -41,14 +42,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 dbe42d5..237d0fd 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 1408ae9..f73c6ed 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 8697d53..7177beb 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 97c8afb..486f790 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 d224d5a..8dde3f8 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 3eb2b45..ce6a9a4 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 2634624..432b3f2 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/daemon_com.c b/src/vol/daemon_com.c
index a14e25c..49a69dc 100644 (file)
--- a/src/vol/daemon_com.c
+++ b/src/vol/daemon_com.c
@@ -39,14 +39,7 @@ RCSID
 #include <errno.h>
 #include <assert.h>
 #include <signal.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 
 #include <rx/xdr.h>

diff --git a/src/vol/devname.c b/src/vol/devname.c
index 0d5a017..86e4e00 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
@@ -83,16 +84,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/fssync-client.c b/src/vol/fssync-client.c
index 205a089..7715bca 100644 (file)
--- a/src/vol/fssync-client.c
+++ b/src/vol/fssync-client.c
@@ -65,15 +65,7 @@ RCSID
 #include <afs/assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #include <signal.h>
-
-#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>

diff --git a/src/vol/fssync-server.c b/src/vol/fssync-server.c
index 5ceacf3..8aa6e00 100644 (file)
--- a/src/vol/fssync-server.c
+++ b/src/vol/fssync-server.c
@@ -74,15 +74,7 @@ RCSID
 #include <afs/assert.h>
 #endif /* AFS_PTHREAD_ENV */
 #include <signal.h>
-
-#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>

diff --git a/src/vol/ihandle.c b/src/vol/ihandle.c
index c502d33..fa235fd 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 c1f8617..1e10982 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 85a6577..1e665fc 100644 (file)
--- a/src/vol/partition.c
+++ b/src/vol/partition.c
@@ -25,6 +25,7 @@ RCSID
     ("$Header$");
 
 #include <ctype.h>
+#include <string.h>
 #ifdef AFS_NT40_ENV
 #include <windows.h>
 #include <winbase.h>
@@ -107,14 +108,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 ac3eeb4..c463a4e 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 77695e3..87ecc99 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/salvsync-client.c b/src/vol/salvsync-client.c
index 7ed96d6..c504fe0 100644 (file)
--- a/src/vol/salvsync-client.c
+++ b/src/vol/salvsync-client.c
@@ -35,15 +35,7 @@ RCSID
 #include <errno.h>
 #include <assert.h>
 #include <signal.h>
-
-#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>

diff --git a/src/vol/salvsync-server.c b/src/vol/salvsync-server.c
index e7549e9..70d2a4a 100644 (file)
--- a/src/vol/salvsync-server.c
+++ b/src/vol/salvsync-server.c
@@ -44,14 +44,7 @@ RCSID
 #include <errno.h>
 #include <assert.h>
 #include <signal.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 
 #include <rx/xdr.h>

diff --git a/src/vol/vnode.c b/src/vol/vnode.c
index 75e90bd..e73a12a 100644 (file)
--- a/src/vol/vnode.c
+++ b/src/vol/vnode.c
@@ -24,13 +24,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 8d9e7f2..5f11a72 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 e83eb65..e312ff1 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 31cac65..f285d74 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 341c0d9..f436447 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 29ccf2d..db10bc1 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 e1dd043..321bf38 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 0ef9acb..df5f20f 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>
@@ -61,14 +62,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 bd64d64..c9193bb 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 e6f5089..ec7c639 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 1aebfcc..e74b9e3 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 109df3d..c049ed3 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 95fb3bb..e6a8a54 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 a3f7b67..2805b12 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 6d05387..d580e9d 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 90c6cec..0c97afb 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.