From 42a5227d8456bd36a69c06ed0401e06d1aeb24f5 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Tue, 30 Oct 2007 15:16:33 +0000 Subject: [PATCH] DEVEL15-openafs-string-header-cleanup-20071030 fix string head inclusion issue (cherry picked from commit 7d05bd439e144aa3bc5fd68908d1a359182897b0) --- src/afsd/vsys.c | 6 ------ src/afsmonitor/afsmon-output.c | 7 ------- src/afsmonitor/afsmon-win.c | 2 -- src/aklog/asetkey.c | 8 -------- src/auth/authcon.c | 1 + src/auth/cellconfig.c | 6 ------ src/auth/copyauth.c | 7 ------- src/auth/ktc.c | 6 ------ src/auth/setkey.c | 6 ------ src/auth/writeconfig.c | 6 ------ src/bozo/bnode.c | 7 ------- src/bozo/bos_util.c | 7 ------- src/bozo/bosoprocs.c | 7 ------- src/bozo/cronbnodeops.c | 6 ------ src/bozo/ezbnodeops.c | 6 ------ src/bozo/fsbnodeops.c | 6 ------ src/bucoord/bc.p.h | 7 ++----- src/budb/database.c | 8 -------- src/budb/db_alloc.c | 6 ------ src/budb/db_dump.c | 7 ------- src/budb/db_hash.c | 6 ------ src/budb/db_text.c | 6 ------ src/budb/ol_verify.c | 6 ------ src/budb/procs.c | 7 ------- src/budb/server.c | 8 -------- src/butc/dbentries.c | 1 + src/butc/dump.c | 1 + src/butc/lwps.c | 1 + src/butc/read_tape.c | 1 + src/butc/recoverDb.c | 1 + src/butc/tcprocs.c | 1 + src/butc/tcstatus.c | 1 + src/butc/tcudbprocs.c | 1 + src/butm/file_tm.c | 1 + src/config/mc.c | 2 -- src/dir/dir.c | 6 ------ src/dir/salvage.c | 6 ------ src/fsprobe/fsprobe.c | 6 ------ src/fsprobe/fsprobe_test.c | 7 ------- src/gtx/curseswindows.c | 7 ------- src/gtx/frame.c | 6 ------ src/gtx/gtxtest.c | 7 ------- src/gtx/keymap.c | 7 ------- src/gtx/lightobject.c | 8 -------- src/gtx/objects.c | 7 ------- src/gtx/textcb.c | 7 ------- src/gtx/textobject.c | 7 ------- src/kauth/authclient.c | 6 ------ src/kauth/client.c | 6 ------ src/kauth/kaauxdb.c | 6 ------ src/kauth/kadatabase.c | 7 ------- src/kauth/kalocalcell.c | 6 ------ src/kauth/kalog.c | 6 ------ src/kauth/kas.c | 6 ------ src/kauth/kaserver.c | 6 ------ src/kauth/kautils.c | 6 ------ src/kauth/klog.c | 7 ------- src/kauth/knfs.c | 6 ------ src/kauth/kpasswd.c | 6 ------ src/kauth/kpwvalid.c | 6 ------ src/kauth/krb_tf.c | 6 ------ src/kauth/krb_udp.c | 6 ------ src/kauth/read_passwd.c | 7 ------- src/kauth/rebuild.c | 6 ------ src/kauth/token.c | 6 ------ src/kauth/user.c | 6 ------ src/libacl/aclprocs.c | 2 -- src/libadmin/bos/afs_bosAdmin.c | 7 ------- src/libadmin/cfg/cfgclient.c | 8 -------- src/libadmin/kas/afs_kasAdmin.c | 7 ------- src/libadmin/pts/afs_ptsAdmin.c | 9 --------- src/libadmin/samples/rxdebug_rx_stats.c | 8 -------- src/libadmin/samples/rxstat_get_peer.c | 6 ------ src/libadmin/samples/rxstat_get_process.c | 7 ------- src/libadmin/vos/afs_vosAdmin.c | 6 ------ src/libadmin/vos/lockprocs.c | 6 ------ src/libadmin/vos/vosutils.c | 6 ------ src/libadmin/vos/vsprocs.c | 6 ------ src/log/kseal.c | 6 ------ src/log/tokens.c | 7 ------- src/log/unlog.c | 7 ------- src/lwp/lwp.c | 6 ------ src/lwp/threadname.c | 7 +------ src/lwp/waitkey.c | 6 ------ src/pam/afs_pam_msg.c | 6 ------ src/pam/afs_util.c | 6 ------ src/ptserver/db_verify.c | 6 ------ src/ptserver/display.c | 6 ------ src/ptserver/ptprocs.c | 6 ------ src/ptserver/ptserver.c | 6 ------ src/ptserver/ptuser.c | 6 ------ src/ptserver/ptutils.c | 6 ------ src/ptserver/readgroup.c | 6 ------ src/ptserver/readpwd.c | 6 ------ src/ptserver/testpt.c | 6 ------ src/ptserver/ubik.c | 7 ------- src/ptserver/utils.c | 6 ------ src/rx/rx.c | 8 +------- src/rx/rx_misc.c | 6 ------ src/rx/rx_packet.c | 6 ------ src/rx/rx_pthread.c | 1 + src/rx/rx_rdwr.c | 6 ------ src/rx/rx_trace.c | 6 ------ src/rx/rx_user.c | 8 +------- src/rx/xdr.c | 1 + src/rx/xdr_array.c | 1 + src/rx/xdr_rec.c | 6 ------ src/rx/xdr_refernce.c | 1 + src/rxdebug/rxdebug.c | 6 ------ src/rxgen/rpc_cout.c | 6 ------ src/rxgen/rpc_main.c | 6 ------ src/rxgen/rpc_parse.c | 6 ------ src/rxgen/rpc_scan.c | 7 +------ src/rxgen/rpc_svcout.c | 6 ------ src/rxgen/rpc_util.c | 6 ------ src/rxkad/crc.c | 6 ------ src/rxkad/domestic/crypt_conn.c | 1 + src/rxkad/domestic/fcrypt.c | 1 + src/rxkad/md4.c | 6 ------ src/rxkad/md5.c | 7 ------- src/rxkad/rxkad_client.c | 6 ------ src/rxkad/rxkad_common.c | 8 +------- src/rxkad/rxkad_server.c | 6 ------ src/rxkad/ticket.c | 6 ------ src/rxkad/ticket5.c | 6 ------ src/scout/scout.c | 6 ------ src/sys/pagsh.c | 2 -- src/sys/rmtsysc.c | 2 -- src/sys/rmtsysnet.c | 6 ------ src/sys/rmtsyss.c | 2 -- src/tviced/serialize_state.c | 8 +------- src/tviced/state_analyzer.c | 7 ------- src/ubik/beacon.c | 6 ------ src/ubik/disk.c | 6 ------ src/ubik/phys.c | 6 ------ src/ubik/recovery.c | 6 ------ src/ubik/remote.c | 6 ------ src/ubik/ubik.c | 6 ------ src/ubik/ubikcmd.c | 6 ------ src/ubik/udebug.c | 6 ------ src/ubik/uinit.c | 6 ------ src/ubik/utst_client.c | 6 ------ src/ubik/utst_server.c | 6 ------ src/ubik/vote.c | 6 ------ src/update/client.c | 6 ------ src/update/server.c | 6 ------ src/update/utils.c | 6 ------ src/usd/usd_file.c | 6 ------ src/uss/grammar.y | 7 ------- src/uss/lex.l | 6 ------ src/uss/uss.c | 6 ------ src/uss/uss_acl.c | 6 ------ src/uss/uss_common.c | 7 ------- src/uss/uss_common.h | 6 ------ src/uss/uss_fs.c | 6 ------ src/uss/uss_kauth.c | 6 ------ src/uss/uss_procs.c | 6 ------ src/uss/uss_vol.c | 6 ------ src/util/assert.c | 6 ------ src/util/casestrcpy.c | 6 ------ src/util/fileutil.c | 8 +------- src/util/get_krbrlm.c | 2 ++ src/util/hostparse.c | 6 ------ src/util/kreltime.c | 6 ------ src/util/ktime.c | 6 ------ src/util/netutils.c | 6 ------ src/util/serverLog.c | 6 ------ src/util/snprintf.c | 8 +------- src/util/uuid.c | 8 +------- src/util/volparse.c | 6 ------ src/venus/cmdebug.c | 6 ------ src/venus/fs.c | 6 ------ src/venus/fstrace.c | 6 ------ src/venus/livesys.c | 6 ------ src/venus/up.c | 6 ------ src/vfsck/dirutils.c | 1 + src/vfsck/setup.c | 1 + src/vfsck/utilities.c | 1 + src/viced/afsfileprocs.c | 7 ------- src/viced/callback.c | 8 +------- src/viced/fsprobe.c | 8 -------- src/viced/host.c | 9 +-------- src/viced/physio.c | 8 +------- src/viced/viced.c | 9 +-------- src/vlserver/cnvldb.c | 7 ------- src/vlserver/vlclient.c | 7 ------- src/vlserver/vldb_check.c | 9 +-------- src/vlserver/vlprocs.c | 8 +------- src/vlserver/vlserver.c | 9 +-------- src/vlserver/vlutils.c | 9 +-------- src/vol/clone.c | 6 ------ src/vol/daemon_com.c | 7 ------- src/vol/devname.c | 11 +---------- src/vol/fssync-client.c | 8 -------- src/vol/fssync-server.c | 8 -------- src/vol/ihandle.c | 9 ++------- src/vol/listinodes.c | 2 ++ src/vol/partition.c | 9 +-------- src/vol/physio.c | 6 ------ src/vol/purge.c | 6 ------ src/vol/salvsync-client.c | 8 -------- src/vol/salvsync-server.c | 7 ------- src/vol/vnode.c | 6 ------ src/volser/dumpstuff.c | 8 +------- src/volser/lockprocs.c | 6 ------ src/volser/physio.c | 6 ------ src/volser/restorevol.c | 7 ------- src/volser/volmain.c | 8 +------- src/volser/volprocs.c | 9 +-------- src/volser/voltrans.c | 9 +-------- src/volser/vos.c | 9 +-------- src/volser/vsprocs.c | 9 +-------- src/volser/vsutils.c | 9 +-------- src/xstat/xstat_cm.c | 7 ------- src/xstat/xstat_cm_test.c | 6 ------ src/xstat/xstat_fs.c | 7 ------- src/xstat/xstat_fs_callback.c | 7 ------- src/xstat/xstat_fs_test.c | 6 ------ 218 files changed, 53 insertions(+), 1255 deletions(-) diff --git a/src/afsd/vsys.c b/src/afsd/vsys.c index 424eb1b3c..a36b5cdd0 100644 --- a/src/afsd/vsys.c +++ b/src/afsd/vsys.c @@ -12,13 +12,7 @@ #include #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/afsmonitor/afsmon-output.c b/src/afsmonitor/afsmon-output.c index 5ab39e4e0..8f2f2f89d 100644 --- a/src/afsmonitor/afsmon-output.c +++ b/src/afsmonitor/afsmon-output.c @@ -19,14 +19,7 @@ #include #include #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif RCSID ("$Header$"); diff --git a/src/afsmonitor/afsmon-win.c b/src/afsmonitor/afsmon-win.c index e54d17f5c..6a564b41c 100644 --- a/src/afsmonitor/afsmon-win.c +++ b/src/afsmonitor/afsmon-win.c @@ -22,9 +22,7 @@ RCSID #include #include #include -#ifdef HAVE_STRING_H #include -#endif #undef IN #include diff --git a/src/aklog/asetkey.c b/src/aklog/asetkey.c index 4cf551414..40b670881 100644 --- a/src/aklog/asetkey.c +++ b/src/aklog/asetkey.c @@ -14,19 +14,11 @@ #ifdef HAVE_UNISTD_H #include #endif -#ifdef HAVE_STDLIB_H #include -#endif #ifdef HAVE_MEMORY_H #include #endif /* HAVE_MEMORY_H */ -#ifdef HAVE_STRING_H #include -#else /* HAVE_STRING_H */ -#ifdef HAVE_STRINGS_H -#include -#endif /* HAVE_STRINGS_H */ -#endif /* HAVE_STRING_H */ #include #include diff --git a/src/auth/authcon.c b/src/auth/authcon.c index aff1106a8..c57abeec3 100644 --- a/src/auth/authcon.c +++ b/src/auth/authcon.c @@ -41,6 +41,7 @@ RCSID #include #include #endif +#include #include #include #include diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c index 6757a38fa..37c5f0304 100644 --- a/src/auth/cellconfig.c +++ b/src/auth/cellconfig.c @@ -47,13 +47,7 @@ RCSID #include #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/auth/copyauth.c b/src/auth/copyauth.c index 96a5e59c3..e1a592d8e 100644 --- a/src/auth/copyauth.c +++ b/src/auth/copyauth.c @@ -13,14 +13,7 @@ RCSID ("$Header$"); -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include #include "auth.h" #ifdef AFS_NT40_ENV diff --git a/src/auth/ktc.c b/src/auth/ktc.c index 74c1d0b35..1b6cfb37a 100644 --- a/src/auth/ktc.c +++ b/src/auth/ktc.c @@ -49,13 +49,7 @@ RCSID #include #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #ifdef AFS_AIX_ENV #include diff --git a/src/auth/setkey.c b/src/auth/setkey.c index edefbd603..299928145 100644 --- a/src/auth/setkey.c +++ b/src/auth/setkey.c @@ -21,13 +21,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef HAVE_NETINET_IN_H #include #endif diff --git a/src/auth/writeconfig.c b/src/auth/writeconfig.c index c94715805..153bc5663 100644 --- a/src/auth/writeconfig.c +++ b/src/auth/writeconfig.c @@ -28,13 +28,7 @@ RCSID #endif #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef HAVE_FCNTL_H #include #endif diff --git a/src/bozo/bnode.c b/src/bozo/bnode.c index 0ebdfb3d5..f6facc31a 100644 --- a/src/bozo/bnode.c +++ b/src/bozo/bnode.c @@ -28,14 +28,7 @@ RCSID #include #endif #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include /* signal(), kill(), wait(), etc. */ #include diff --git a/src/bozo/bos_util.c b/src/bozo/bos_util.c index b6e992fe9..c29b79790 100644 --- a/src/bozo/bos_util.c +++ b/src/bozo/bos_util.c @@ -28,14 +28,7 @@ RCSID #include #include #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include diff --git a/src/bozo/bosoprocs.c b/src/bozo/bosoprocs.c index 9d368cac1..a9b1b294d 100644 --- a/src/bozo/bosoprocs.c +++ b/src/bozo/bosoprocs.c @@ -37,14 +37,7 @@ RCSID #include #include #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include "bnode.h" #include "bosint.h" diff --git a/src/bozo/cronbnodeops.c b/src/bozo/cronbnodeops.c index 7fecb2c4f..6657cd2f5 100644 --- a/src/bozo/cronbnodeops.c +++ b/src/bozo/cronbnodeops.c @@ -23,13 +23,7 @@ RCSID #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include diff --git a/src/bozo/ezbnodeops.c b/src/bozo/ezbnodeops.c index 7852d9cbd..b55ab1e7b 100644 --- a/src/bozo/ezbnodeops.c +++ b/src/bozo/ezbnodeops.c @@ -21,13 +21,7 @@ RCSID #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include diff --git a/src/bozo/fsbnodeops.c b/src/bozo/fsbnodeops.c index 7e3a46772..f06eb3917 100644 --- a/src/bozo/fsbnodeops.c +++ b/src/bozo/fsbnodeops.c @@ -26,13 +26,7 @@ RCSID #else #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #endif /* AFS_NT40_ENV */ diff --git a/src/bucoord/bc.p.h b/src/bucoord/bc.p.h index 4e385e238..4fbc1bfc6 100644 --- a/src/bucoord/bc.p.h +++ b/src/bucoord/bc.p.h @@ -13,11 +13,8 @@ #ifdef HAVE_STDIO_H #include #endif /* HAVE_STDIO_H */ -#if defined(HAVE_STRING_H) -# include -#elif defined(HAVE_STRINGS_H) -# include -#endif /* HAVE_STRING_H */ + +#include /* * Represents a host in the config database. diff --git a/src/budb/database.c b/src/budb/database.c index 42c4f43c9..56797f642 100644 --- 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 -#else -#ifdef HAVE_STRINGS_H -#include -#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 fbed0a6b7..4ac984a42 100644 --- a/src/budb/db_alloc.c +++ b/src/budb/db_alloc.c @@ -18,13 +18,7 @@ RCSID #else #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/budb/db_dump.c b/src/budb/db_dump.c index 587fde42c..8c5a61446 100644 --- a/src/budb/db_dump.c +++ b/src/budb/db_dump.c @@ -28,14 +28,7 @@ RCSID #include #include #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include "database.h" #include "budb.h" diff --git a/src/budb/db_hash.c b/src/budb/db_hash.c index 16a0636e8..d9b9897c2 100644 --- a/src/budb/db_hash.c +++ b/src/budb/db_hash.c @@ -18,13 +18,7 @@ RCSID #else #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/budb/db_text.c b/src/budb/db_text.c index 8876612bc..9ce5b9b0b 100644 --- a/src/budb/db_text.c +++ b/src/budb/db_text.c @@ -22,13 +22,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/budb/ol_verify.c b/src/budb/ol_verify.c index 7af32766c..741630ef1 100644 --- a/src/budb/ol_verify.c +++ b/src/budb/ol_verify.c @@ -22,13 +22,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/budb/procs.c b/src/budb/procs.c index 9524e1b2a..2ad1be005 100644 --- a/src/budb/procs.c +++ b/src/budb/procs.c @@ -29,14 +29,7 @@ RCSID #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include #include #include diff --git a/src/budb/server.c b/src/budb/server.c index 3a2f83e5d..2a8f11c6e 100644 --- a/src/budb/server.c +++ b/src/budb/server.c @@ -24,15 +24,7 @@ RCSID #include #include #endif - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include #include #include diff --git a/src/butc/dbentries.c b/src/butc/dbentries.c index 5da1ba1ef..13884413e 100644 --- a/src/butc/dbentries.c +++ b/src/butc/dbentries.c @@ -24,6 +24,7 @@ RCSID #include #endif #include +#include #include #include #include diff --git a/src/butc/dump.c b/src/butc/dump.c index 5f5b95f63..56562e4ee 100644 --- a/src/butc/dump.c +++ b/src/butc/dump.c @@ -24,6 +24,7 @@ RCSID #include #endif #include +#include #include #include #include diff --git a/src/butc/lwps.c b/src/butc/lwps.c index 038d5bc7b..df3359037 100644 --- a/src/butc/lwps.c +++ b/src/butc/lwps.c @@ -14,6 +14,7 @@ RCSID ("$Header$"); #include +#include #ifdef AFS_NT40_ENV #include #include diff --git a/src/butc/read_tape.c b/src/butc/read_tape.c index 0f4aee846..a99d0be23 100644 --- a/src/butc/read_tape.c +++ b/src/butc/read_tape.c @@ -21,6 +21,7 @@ RCSID #include #include #include +#include #include #include diff --git a/src/butc/recoverDb.c b/src/butc/recoverDb.c index fe40c8ac5..dd51fa660 100644 --- a/src/butc/recoverDb.c +++ b/src/butc/recoverDb.c @@ -24,6 +24,7 @@ RCSID #include #endif #include +#include #include #include #include diff --git a/src/butc/tcprocs.c b/src/butc/tcprocs.c index 89b01baf1..1f904b1af 100644 --- a/src/butc/tcprocs.c +++ b/src/butc/tcprocs.c @@ -27,6 +27,7 @@ RCSID #include #include #include +#include #include #include #include diff --git a/src/butc/tcstatus.c b/src/butc/tcstatus.c index 79c0c5365..08cbfb958 100644 --- a/src/butc/tcstatus.c +++ b/src/butc/tcstatus.c @@ -24,6 +24,7 @@ RCSID #include #endif #include +#include #include #include #include diff --git a/src/butc/tcudbprocs.c b/src/butc/tcudbprocs.c index 4e0a754ec..eebac7ffc 100644 --- a/src/butc/tcudbprocs.c +++ b/src/butc/tcudbprocs.c @@ -28,6 +28,7 @@ RCSID #include #include #include +#include #include #include #include diff --git a/src/butm/file_tm.c b/src/butm/file_tm.c index e6b71ab03..4458aa21c 100644 --- a/src/butm/file_tm.c +++ b/src/butm/file_tm.c @@ -24,6 +24,7 @@ RCSID #include #include #include +#include #include #include #include diff --git a/src/config/mc.c b/src/config/mc.c index 9a75a2c71..9e451ba0d 100644 --- a/src/config/mc.c +++ b/src/config/mc.c @@ -16,9 +16,7 @@ #include #include -#ifdef HAVE_STRING_H #include -#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 cfbf2d3da..ec4ad2632 100644 --- a/src/dir/dir.c +++ b/src/dir/dir.c @@ -100,13 +100,7 @@ extern void *DNew(); #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #endif /* KERNEL */ afs_int32 DErrno; diff --git a/src/dir/salvage.c b/src/dir/salvage.c index f499a057a..4b867e08f 100644 --- a/src/dir/salvage.c +++ b/src/dir/salvage.c @@ -23,13 +23,7 @@ RCSID #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#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 863a043e4..f512aeca1 100644 --- a/src/fsprobe/fsprobe.c +++ b/src/fsprobe/fsprobe.c @@ -20,13 +20,7 @@ RCSID ("$Header$"); -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include /*Interface for this module */ #include /*Lightweight process package */ diff --git a/src/fsprobe/fsprobe_test.c b/src/fsprobe/fsprobe_test.c index bff804d79..5951e0412 100644 --- a/src/fsprobe/fsprobe_test.c +++ b/src/fsprobe/fsprobe_test.c @@ -19,14 +19,7 @@ RCSID ("$Header$"); -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include /*Interface for fsprobe module */ /* diff --git a/src/gtx/curseswindows.c b/src/gtx/curseswindows.c index a1d351b2e..601dc2bb2 100644 --- a/src/gtx/curseswindows.c +++ b/src/gtx/curseswindows.c @@ -37,14 +37,7 @@ RCSID #include #include #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include "gtxcurseswin.h" /*Interface definition */ diff --git a/src/gtx/frame.c b/src/gtx/frame.c index 983226f4b..a0b5fc02c 100644 --- a/src/gtx/frame.c +++ b/src/gtx/frame.c @@ -19,13 +19,7 @@ RCSID #endif #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include "gtxobjects.h" diff --git a/src/gtx/gtxtest.c b/src/gtx/gtxtest.c index 68877ac70..5277c0109 100644 --- a/src/gtx/gtxtest.c +++ b/src/gtx/gtxtest.c @@ -13,14 +13,7 @@ RCSID ("$Header$"); - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include "gtxwindows.h" #include "gtxobjects.h" diff --git a/src/gtx/keymap.c b/src/gtx/keymap.c index e6c010016..93dedcfc5 100644 --- a/src/gtx/keymap.c +++ b/src/gtx/keymap.c @@ -13,14 +13,7 @@ RCSID ("$Header$"); - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include "gtxkeymap.h" diff --git a/src/gtx/lightobject.c b/src/gtx/lightobject.c index 4feaf1a33..db9e6980c 100644 --- a/src/gtx/lightobject.c +++ b/src/gtx/lightobject.c @@ -22,17 +22,9 @@ RCSID #include "gtxlightobj.h" /*Interface for this module */ #include /*Standard I/O stuff */ #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include - /*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 1ca8facb9..86299701a 100644 --- a/src/gtx/objects.c +++ b/src/gtx/objects.c @@ -26,14 +26,7 @@ RCSID #include /*Standard I/O stuff */ #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include /* diff --git a/src/gtx/textcb.c b/src/gtx/textcb.c index 5bc5d6545..3b095e687 100644 --- a/src/gtx/textcb.c +++ b/src/gtx/textcb.c @@ -22,14 +22,7 @@ RCSID #include "gtxtextcb.h" /*Module interface */ #include /*Standard I/O stuff */ #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include static int gator_textcb_debug; /*Is debugging output turned on? */ diff --git a/src/gtx/textobject.c b/src/gtx/textobject.c index 5c7bc33d5..9cdd08b78 100644 --- a/src/gtx/textobject.c +++ b/src/gtx/textobject.c @@ -25,14 +25,7 @@ RCSID #include "gtxX11win.h" /*Gator X11 window interface */ #include /*Standard I/O stuff */ #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include /*Externally-advertised array of text onode operations*/ diff --git a/src/kauth/authclient.c b/src/kauth/authclient.c index 86d7b1f7e..9d9996637 100644 --- a/src/kauth/authclient.c +++ b/src/kauth/authclient.c @@ -46,13 +46,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/kauth/client.c b/src/kauth/client.c index 6c0a180aa..eea34eab9 100644 --- a/src/kauth/client.c +++ b/src/kauth/client.c @@ -41,13 +41,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef HAVE_UNISTD_H #define __USE_XOPEN #include diff --git a/src/kauth/kaauxdb.c b/src/kauth/kaauxdb.c index aef045dfe..507500a8f 100644 --- a/src/kauth/kaauxdb.c +++ b/src/kauth/kaauxdb.c @@ -25,13 +25,7 @@ RCSID #ifdef HAVE_FCNTL_H #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include "ubik_int.h" #include "kauth.h" diff --git a/src/kauth/kadatabase.c b/src/kauth/kadatabase.c index c3bee37b4..a1e658081 100644 --- a/src/kauth/kadatabase.c +++ b/src/kauth/kadatabase.c @@ -19,14 +19,7 @@ RCSID #else #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif -#include #include #include #include diff --git a/src/kauth/kalocalcell.c b/src/kauth/kalocalcell.c index 0081e9c7e..a2e7c0703 100644 --- a/src/kauth/kalocalcell.c +++ b/src/kauth/kalocalcell.c @@ -37,13 +37,7 @@ RCSID #else #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/kauth/kalog.c b/src/kauth/kalog.c index bd51f247b..8bc6cbddf 100644 --- a/src/kauth/kalog.c +++ b/src/kauth/kalog.c @@ -24,13 +24,7 @@ RCSID #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef HAVE_FCNTL_H #include #endif diff --git a/src/kauth/kas.c b/src/kauth/kas.c index 8ecfa6140..ca75c536f 100644 --- a/src/kauth/kas.c +++ b/src/kauth/kas.c @@ -29,13 +29,7 @@ RCSID #else #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include diff --git a/src/kauth/kaserver.c b/src/kauth/kaserver.c index 2b5e9a9bb..62e192522 100644 --- a/src/kauth/kaserver.c +++ b/src/kauth/kaserver.c @@ -26,13 +26,7 @@ RCSID #include "kalog.h" /* for OpenLog() */ #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef HAVE_FCNTL_H #include #endif diff --git a/src/kauth/kautils.c b/src/kauth/kautils.c index 2a43c4f1b..21ee9d772 100644 --- a/src/kauth/kautils.c +++ b/src/kauth/kautils.c @@ -22,13 +22,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/kauth/klog.c b/src/kauth/klog.c index c82ac7d85..2028dc7a4 100644 --- a/src/kauth/klog.c +++ b/src/kauth/klog.c @@ -19,14 +19,7 @@ RCSID #ifdef AFS_AIX32_ENV #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include #include diff --git a/src/kauth/knfs.c b/src/kauth/knfs.c index 68f08e525..6f4a9823a 100644 --- a/src/kauth/knfs.c +++ b/src/kauth/knfs.c @@ -27,13 +27,7 @@ RCSID #include #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/kauth/kpasswd.c b/src/kauth/kpasswd.c index 211b2f704..f1d3d5478 100644 --- a/src/kauth/kpasswd.c +++ b/src/kauth/kpasswd.c @@ -29,13 +29,7 @@ RCSID #ifndef AFS_NT40_ENV #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/kauth/kpwvalid.c b/src/kauth/kpwvalid.c index e42ed953c..703a5b6e8 100644 --- a/src/kauth/kpwvalid.c +++ b/src/kauth/kpwvalid.c @@ -14,13 +14,7 @@ RCSID ("$Header$"); #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef AFS_NT40_ENV #include #endif diff --git a/src/kauth/krb_tf.c b/src/kauth/krb_tf.c index 21090569b..7d577afe9 100644 --- a/src/kauth/krb_tf.c +++ b/src/kauth/krb_tf.c @@ -58,13 +58,7 @@ RCSID #else #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/kauth/krb_udp.c b/src/kauth/krb_udp.c index 68d213c55..110a56482 100644 --- a/src/kauth/krb_udp.c +++ b/src/kauth/krb_udp.c @@ -30,13 +30,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/kauth/read_passwd.c b/src/kauth/read_passwd.c index 0cac47afc..28f40535e 100644 --- a/src/kauth/read_passwd.c +++ b/src/kauth/read_passwd.c @@ -35,14 +35,7 @@ int strcmp(); #if defined(AFS_SGI_ENV) #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#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 c9641a869..ad4aac047 100644 --- a/src/kauth/rebuild.c +++ b/src/kauth/rebuild.c @@ -23,13 +23,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/kauth/token.c b/src/kauth/token.c index 7a126bba7..d28e3c702 100644 --- a/src/kauth/token.c +++ b/src/kauth/token.c @@ -44,13 +44,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif /* netinet/in.h and cellconfig.h are needed together */ #include /* these are needed together */ diff --git a/src/kauth/user.c b/src/kauth/user.c index f53730a6b..7a188d7a2 100644 --- a/src/kauth/user.c +++ b/src/kauth/user.c @@ -45,13 +45,7 @@ RCSID #else #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/libacl/aclprocs.c b/src/libacl/aclprocs.c index 24367419c..03a3fd485 100644 --- a/src/libacl/aclprocs.c +++ b/src/libacl/aclprocs.c @@ -25,9 +25,7 @@ RCSID #else #include #endif -#ifdef HAVE_STRING_H #include -#endif #include #include #include diff --git a/src/libadmin/bos/afs_bosAdmin.c b/src/libadmin/bos/afs_bosAdmin.c index ed7f21e65..6ad03a7a4 100644 --- a/src/libadmin/bos/afs_bosAdmin.c +++ b/src/libadmin/bos/afs_bosAdmin.c @@ -32,14 +32,7 @@ RCSID #else #include #endif - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif typedef struct bos_server { int begin_magic; diff --git a/src/libadmin/cfg/cfgclient.c b/src/libadmin/cfg/cfgclient.c index 3d2aadd84..339887bec 100644 --- a/src/libadmin/cfg/cfgclient.c +++ b/src/libadmin/cfg/cfgclient.c @@ -23,15 +23,7 @@ RCSID #include #include #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include #include diff --git a/src/libadmin/kas/afs_kasAdmin.c b/src/libadmin/kas/afs_kasAdmin.c index 468b72583..d3bbdce1d 100644 --- a/src/libadmin/kas/afs_kasAdmin.c +++ b/src/libadmin/kas/afs_kasAdmin.c @@ -14,14 +14,7 @@ RCSID ("$Header$"); #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include "afs_kasAdmin.h" diff --git a/src/libadmin/pts/afs_ptsAdmin.c b/src/libadmin/pts/afs_ptsAdmin.c index f46764b70..07286a1d6 100644 --- a/src/libadmin/pts/afs_ptsAdmin.c +++ b/src/libadmin/pts/afs_ptsAdmin.c @@ -14,15 +14,6 @@ RCSID ("$Header$"); #include - -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include #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 d4d230eb8..b8ed0af32 100644 --- a/src/libadmin/samples/rxdebug_rx_stats.c +++ b/src/libadmin/samples/rxdebug_rx_stats.c @@ -23,15 +23,7 @@ RCSID #include #include #endif - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include #include #include diff --git a/src/libadmin/samples/rxstat_get_peer.c b/src/libadmin/samples/rxstat_get_peer.c index 3b2504007..0632411ea 100644 --- a/src/libadmin/samples/rxstat_get_peer.c +++ b/src/libadmin/samples/rxstat_get_peer.c @@ -24,13 +24,7 @@ RCSID #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include diff --git a/src/libadmin/samples/rxstat_get_process.c b/src/libadmin/samples/rxstat_get_process.c index 0eb31bdab..6c7bc3571 100644 --- a/src/libadmin/samples/rxstat_get_process.c +++ b/src/libadmin/samples/rxstat_get_process.c @@ -23,14 +23,7 @@ RCSID #include #include #endif - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include diff --git a/src/libadmin/vos/afs_vosAdmin.c b/src/libadmin/vos/afs_vosAdmin.c index 9c14c13c7..15d170129 100644 --- a/src/libadmin/vos/afs_vosAdmin.c +++ b/src/libadmin/vos/afs_vosAdmin.c @@ -15,13 +15,7 @@ RCSID #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/vos/lockprocs.c b/src/libadmin/vos/lockprocs.c index 5234a265a..bc72dfd79 100644 --- 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 -#else -#ifdef HAVE_STRINGS_H -#include -#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 f74602c36..878920d85 100644 --- a/src/libadmin/vos/vosutils.c +++ b/src/libadmin/vos/vosutils.c @@ -17,13 +17,7 @@ RCSID #include "vsprocs.h" #include "lockprocs.h" #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif /* * VLDB entry conversion routines. diff --git a/src/libadmin/vos/vsprocs.c b/src/libadmin/vos/vsprocs.c index f7d19cb02..490ae8e92 100644 --- a/src/libadmin/vos/vsprocs.c +++ b/src/libadmin/vos/vsprocs.c @@ -30,13 +30,7 @@ RCSID #include "../adminutil/afs_AdminInternal.h" #include #include "afs_vosAdmin.h" -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/log/kseal.c b/src/log/kseal.c index 703954db2..d42df102b 100644 --- a/src/log/kseal.c +++ b/src/log/kseal.c @@ -19,13 +19,7 @@ RCSID #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include diff --git a/src/log/tokens.c b/src/log/tokens.c index 2946735bb..70dd3776d 100644 --- a/src/log/tokens.c +++ b/src/log/tokens.c @@ -25,14 +25,7 @@ RCSID #include /*time(), ctime() */ #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #define VIRTUE #define VICE diff --git a/src/log/unlog.c b/src/log/unlog.c index ba4939d93..44eb712d4 100644 --- a/src/log/unlog.c +++ b/src/log/unlog.c @@ -38,14 +38,7 @@ RCSID #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include #include #include diff --git a/src/lwp/lwp.c b/src/lwp/lwp.c index 2b7649cec..71a4b40fc 100644 --- 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 #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #if !defined(USE_PTHREADS) && !defined(USE_SOLARIS_THREADS) diff --git a/src/lwp/threadname.c b/src/lwp/threadname.c index f36b3170b..3f7e9be0a 100644 --- a/src/lwp/threadname.c +++ b/src/lwp/threadname.c @@ -25,13 +25,8 @@ RCSID ("$Header$"); -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif + #if defined(AFS_PTHREAD_ENV) #include #else /* defined(AFS_PTHREAD_ENV) */ diff --git a/src/lwp/waitkey.c b/src/lwp/waitkey.c index e31e0c525..5d2a88476 100644 --- a/src/lwp/waitkey.c +++ b/src/lwp/waitkey.c @@ -35,13 +35,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#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 c1f702355..d36bd54a6 100644 --- a/src/pam/afs_pam_msg.c +++ b/src/pam/afs_pam_msg.c @@ -14,13 +14,7 @@ RCSID ("$Header$"); #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include "afs_pam_msg.h" diff --git a/src/pam/afs_util.c b/src/pam/afs_util.c index 5c4d4cfcb..861a132d6 100644 --- a/src/pam/afs_util.c +++ b/src/pam/afs_util.c @@ -17,13 +17,7 @@ #include #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include RCSID diff --git a/src/ptserver/db_verify.c b/src/ptserver/db_verify.c index 62c5f2c42..9d321f586 100644 --- a/src/ptserver/db_verify.c +++ b/src/ptserver/db_verify.c @@ -44,13 +44,7 @@ RCSID #include #endif #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/ptserver/display.c b/src/ptserver/display.c index 4ac88b46a..4126831c4 100644 --- a/src/ptserver/display.c +++ b/src/ptserver/display.c @@ -20,13 +20,7 @@ RCSID #else #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include "ptserver.h" diff --git a/src/ptserver/ptprocs.c b/src/ptserver/ptprocs.c index d32aee0bf..a79201a3c 100644 --- a/src/ptserver/ptprocs.c +++ b/src/ptserver/ptprocs.c @@ -69,13 +69,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include "ptserver.h" #include "pterror.h" #include "ptprototypes.h" diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c index 8878fc060..778eba627 100644 --- a/src/ptserver/ptserver.c +++ b/src/ptserver/ptserver.c @@ -129,13 +129,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/ptserver/ptuser.c b/src/ptserver/ptuser.c index 8a835f7a4..7635319b8 100644 --- a/src/ptserver/ptuser.c +++ b/src/ptserver/ptuser.c @@ -40,13 +40,7 @@ RCSID #include #endif #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/ptserver/ptutils.c b/src/ptserver/ptutils.c index f7ad70d43..3c2b83b69 100644 --- a/src/ptserver/ptutils.c +++ b/src/ptserver/ptutils.c @@ -34,13 +34,7 @@ RCSID #else #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/ptserver/readgroup.c b/src/ptserver/readgroup.c index 52300ae1a..954ba316f 100644 --- a/src/ptserver/readgroup.c +++ b/src/ptserver/readgroup.c @@ -18,13 +18,7 @@ RCSID #include #endif #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/ptserver/readpwd.c b/src/ptserver/readpwd.c index 9b9870e20..3131b0b77 100644 --- a/src/ptserver/readpwd.c +++ b/src/ptserver/readpwd.c @@ -17,13 +17,7 @@ RCSID #ifdef AFS_NT40_ENV #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/ptserver/testpt.c b/src/ptserver/testpt.c index 064cf54f5..ab9f408d3 100644 --- a/src/ptserver/testpt.c +++ b/src/ptserver/testpt.c @@ -24,13 +24,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef HAVE_FCNTL_H #include #endif diff --git a/src/ptserver/ubik.c b/src/ptserver/ubik.c index 1739c94f3..a68a82522 100644 --- a/src/ptserver/ubik.c +++ b/src/ptserver/ubik.c @@ -8,14 +8,7 @@ RCSID #include #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #define UBIK_INTERNALS diff --git a/src/ptserver/utils.c b/src/ptserver/utils.c index 504073757..ee01ac38c 100644 --- a/src/ptserver/utils.c +++ b/src/ptserver/utils.c @@ -23,13 +23,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include "ptserver.h" #include "pterror.h" diff --git a/src/rx/rx.c b/src/rx/rx.c index e6a98c388..40c9fc49d 100644 --- 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 +# include # include #ifdef AFS_NT40_ENV # include @@ -93,13 +94,6 @@ extern afs_int32 afs_termState; # include # include #endif -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#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 4b9761d18..2dd3b045a 100644 --- 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 -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c index 8f7489fb3..db3c23ef6 100644 --- a/src/rx/rx_packet.c +++ b/src/rx/rx_packet.c @@ -88,13 +88,7 @@ RCSID #include "rx_globals.h" #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/rx/rx_pthread.c b/src/rx/rx_pthread.c index a03a5a0bc..d63347597 100644 --- a/src/rx/rx_pthread.c +++ b/src/rx/rx_pthread.c @@ -24,6 +24,7 @@ RCSID #include #include #include +#include #ifndef AFS_NT40_ENV # include # include diff --git a/src/rx/rx_rdwr.c b/src/rx/rx_rdwr.c index 91d14a64b..2e3bf0fc7 100644 --- a/src/rx/rx_rdwr.c +++ b/src/rx/rx_rdwr.c @@ -81,13 +81,7 @@ RCSID # include # include #endif /* !AFS_NT40_ENV */ -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/rx/rx_trace.c b/src/rx/rx_trace.c index dfb173530..ac7a6e69d 100644 --- 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 -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef AFS_NT40_ENV #include #include diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c index 9d15032d5..b12a44db4 100644 --- a/src/rx/rx_user.c +++ b/src/rx/rx_user.c @@ -18,6 +18,7 @@ RCSID # include # include # include +# include #ifdef AFS_NT40_ENV # include #else @@ -36,13 +37,6 @@ RCSID #endif #include #include -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#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 5816ef162..54011e6ae 100644 --- a/src/rx/xdr.c +++ b/src/rx/xdr.c @@ -32,6 +32,7 @@ #include "afs/param.h" #else #include +#include #endif RCSID diff --git a/src/rx/xdr_array.c b/src/rx/xdr_array.c index 41776ec93..03d8947d6 100644 --- a/src/rx/xdr_array.c +++ b/src/rx/xdr_array.c @@ -58,6 +58,7 @@ RCSID #endif /* AFS_LINUX20_ENV */ #else #include +#include #endif #include "xdr.h" diff --git a/src/rx/xdr_rec.c b/src/rx/xdr_rec.c index 0a84facd3..ad1464648 100644 --- a/src/rx/xdr_rec.c +++ b/src/rx/xdr_rec.c @@ -59,13 +59,7 @@ RCSID #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#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 9145eb672..f8aa05880 100644 --- a/src/rx/xdr_refernce.c +++ b/src/rx/xdr_refernce.c @@ -46,6 +46,7 @@ RCSID #include "xdr.h" #include +#include #define LASTUNSIGNED ((u_int)0-1) /* diff --git a/src/rxdebug/rxdebug.c b/src/rxdebug/rxdebug.c index a42f5c708..01af04f4e 100644 --- a/src/rxdebug/rxdebug.c +++ b/src/rxdebug/rxdebug.c @@ -32,13 +32,7 @@ RCSID #ifdef HAVE_UNISTD_H #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/rxgen/rpc_cout.c b/src/rxgen/rpc_cout.c index 66599be93..92a864534 100644 --- a/src/rxgen/rpc_cout.c +++ b/src/rxgen/rpc_cout.c @@ -40,13 +40,7 @@ RCSID #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#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 2ac8b4f0e..c223d2fd7 100644 --- a/src/rxgen/rpc_main.c +++ b/src/rxgen/rpc_main.c @@ -43,13 +43,7 @@ RCSID #include #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef HAVE_SIGNAL_H #include #endif diff --git a/src/rxgen/rpc_parse.c b/src/rxgen/rpc_parse.c index fafc81bdb..873e30897 100644 --- a/src/rxgen/rpc_parse.c +++ b/src/rxgen/rpc_parse.c @@ -41,13 +41,7 @@ RCSID #include #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#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 2fd4f17d6..7504bfdc3 100644 --- a/src/rxgen/rpc_scan.c +++ b/src/rxgen/rpc_scan.c @@ -43,13 +43,8 @@ RCSID #include #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#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 6e717f635..288e6ea8c 100644 --- a/src/rxgen/rpc_svcout.c +++ b/src/rxgen/rpc_svcout.c @@ -39,13 +39,7 @@ RCSID ("$Header$"); #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#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 9794442a6..232c1fbe6 100644 --- a/src/rxgen/rpc_util.c +++ b/src/rxgen/rpc_util.c @@ -39,13 +39,7 @@ RCSID ("$Header$"); #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/rxkad/crc.c b/src/rxkad/crc.c index a7e93fc29..65a482731 100644 --- a/src/rxkad/crc.c +++ b/src/rxkad/crc.c @@ -60,13 +60,7 @@ RCSID #else #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/rxkad/domestic/crypt_conn.c b/src/rxkad/domestic/crypt_conn.c index f827e04d7..6d94ddbf7 100644 --- a/src/rxkad/domestic/crypt_conn.c +++ b/src/rxkad/domestic/crypt_conn.c @@ -37,6 +37,7 @@ RCSID #else /* !KERNEL */ #include #include +#include #include #ifdef AFS_NT40_ENV #include diff --git a/src/rxkad/domestic/fcrypt.c b/src/rxkad/domestic/fcrypt.c index 8d1884da6..c9ec88682 100644 --- a/src/rxkad/domestic/fcrypt.c +++ b/src/rxkad/domestic/fcrypt.c @@ -47,6 +47,7 @@ RCSID #include #include +#include #ifdef AFS_NT40_ENV #include #else diff --git a/src/rxkad/md4.c b/src/rxkad/md4.c index 6844caf78..4c61fc1cb 100644 --- a/src/rxkad/md4.c +++ b/src/rxkad/md4.c @@ -55,13 +55,7 @@ #else #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/rxkad/md5.c b/src/rxkad/md5.c index 397023bb4..0e9fcf2c7 100644 --- a/src/rxkad/md5.c +++ b/src/rxkad/md5.c @@ -55,14 +55,7 @@ #else #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif -#include #include #include #include "lifetimes.h" diff --git a/src/rxkad/rxkad_client.c b/src/rxkad/rxkad_client.c index 1f83e2c17..6b34e0b3a 100644 --- a/src/rxkad/rxkad_client.c +++ b/src/rxkad/rxkad_client.c @@ -47,13 +47,7 @@ RCSID #include #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef AFS_NT40_ENV #include #else diff --git a/src/rxkad/rxkad_common.c b/src/rxkad/rxkad_common.c index d71cd3361..0d1351ddc 100644 --- a/src/rxkad/rxkad_common.c +++ b/src/rxkad/rxkad_common.c @@ -50,6 +50,7 @@ RCSID #else /* KERNEL */ #include #include +#include #include #ifdef AFS_NT40_ENV #include @@ -61,13 +62,6 @@ RCSID #endif #include #include -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #endif /* KERNEL */ diff --git a/src/rxkad/rxkad_server.c b/src/rxkad/rxkad_server.c index de57519a1..09adcb9bc 100644 --- a/src/rxkad/rxkad_server.c +++ b/src/rxkad/rxkad_server.c @@ -28,13 +28,7 @@ RCSID #else #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/rxkad/ticket.c b/src/rxkad/ticket.c index e8300b976..54bb3cd0c 100644 --- a/src/rxkad/ticket.c +++ b/src/rxkad/ticket.c @@ -34,13 +34,7 @@ RCSID #else #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/rxkad/ticket5.c b/src/rxkad/ticket5.c index 126721c17..cd7425fc7 100644 --- a/src/rxkad/ticket5.c +++ b/src/rxkad/ticket5.c @@ -81,13 +81,7 @@ RCSID #else #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/scout/scout.c b/src/scout/scout.c index 7b5995d97..c408e3657 100644 --- a/src/scout/scout.c +++ b/src/scout/scout.c @@ -21,13 +21,7 @@ RCSID #ifdef AFS_AIX32_ENV #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #undef IN #include /*Generic window package */ #include /*Object definitions */ diff --git a/src/sys/pagsh.c b/src/sys/pagsh.c index 0b05d3af3..9ccc100ca 100644 --- a/src/sys/pagsh.c +++ b/src/sys/pagsh.c @@ -22,9 +22,7 @@ RCSID #ifndef AFS_NT40_ENV #include #endif -#ifdef HAVE_STRING_H #include -#endif #include #ifdef AFS_KERBEROS_ENV #include diff --git a/src/sys/rmtsysc.c b/src/sys/rmtsysc.c index 6d501af12..f37b87850 100644 --- a/src/sys/rmtsysc.c +++ b/src/sys/rmtsysc.c @@ -31,9 +31,7 @@ RCSID #endif #include #include -#ifdef HAVE_STRING_H #include -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/sys/rmtsysnet.c b/src/sys/rmtsysnet.c index 907f93ff8..c879e73e9 100644 --- a/src/sys/rmtsysnet.c +++ b/src/sys/rmtsysnet.c @@ -26,13 +26,7 @@ RCSID #endif #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/sys/rmtsyss.c b/src/sys/rmtsyss.c index 33bb05a5f..3e206247b 100644 --- a/src/sys/rmtsyss.c +++ b/src/sys/rmtsyss.c @@ -30,9 +30,7 @@ RCSID #include #include #include -#ifdef HAVE_STRING_H #include -#endif /*#include */ #include "rmtsys.h" diff --git a/src/tviced/serialize_state.c b/src/tviced/serialize_state.c index 623919832..1cea24c02 100644 --- a/src/tviced/serialize_state.c +++ b/src/tviced/serialize_state.c @@ -21,6 +21,7 @@ RCSID #include #include /* for malloc() */ #include /* ANSI standard location for time stuff */ +#include #ifdef AFS_NT40_ENV #include #include @@ -28,13 +29,6 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include diff --git a/src/tviced/state_analyzer.c b/src/tviced/state_analyzer.c index f9cb8befb..1919030c3 100644 --- a/src/tviced/state_analyzer.c +++ b/src/tviced/state_analyzer.c @@ -26,14 +26,7 @@ RCSID #include #include #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include diff --git a/src/ubik/beacon.c b/src/ubik/beacon.c index d5b152640..382310961 100644 --- a/src/ubik/beacon.c +++ b/src/ubik/beacon.c @@ -26,13 +26,7 @@ RCSID #endif #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/ubik/disk.c b/src/ubik/disk.c index ee8a14928..e29f8650e 100644 --- a/src/ubik/disk.c +++ b/src/ubik/disk.c @@ -21,13 +21,7 @@ RCSID #include #endif #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include diff --git a/src/ubik/phys.c b/src/ubik/phys.c index caf84aa49..261105683 100644 --- a/src/ubik/phys.c +++ b/src/ubik/phys.c @@ -26,13 +26,7 @@ RCSID #include #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #define UBIK_INTERNALS 1 #include "ubik.h" diff --git a/src/ubik/recovery.c b/src/ubik/recovery.c index 7c86de91e..a04a05978 100644 --- a/src/ubik/recovery.c +++ b/src/ubik/recovery.c @@ -24,13 +24,7 @@ RCSID #endif #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/ubik/remote.c b/src/ubik/remote.c index 1fc84482b..ff0b30b78 100644 --- a/src/ubik/remote.c +++ b/src/ubik/remote.c @@ -20,13 +20,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/ubik/ubik.c b/src/ubik/ubik.c index 2fad57adb..87beebd30 100644 --- a/src/ubik/ubik.c +++ b/src/ubik/ubik.c @@ -23,13 +23,7 @@ RCSID #endif #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/ubik/ubikcmd.c b/src/ubik/ubikcmd.c index cf16f1081..06cfca31e 100644 --- a/src/ubik/ubikcmd.c +++ b/src/ubik/ubikcmd.c @@ -24,13 +24,7 @@ RCSID #endif #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include diff --git a/src/ubik/udebug.c b/src/ubik/udebug.c index 451d5fc2a..3412d7dfa 100644 --- a/src/ubik/udebug.c +++ b/src/ubik/udebug.c @@ -15,13 +15,7 @@ RCSID #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef AFS_NT40_ENV #include #else diff --git a/src/ubik/uinit.c b/src/ubik/uinit.c index 23f44019d..da61e60af 100644 --- a/src/ubik/uinit.c +++ b/src/ubik/uinit.c @@ -28,13 +28,7 @@ RCSID #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include diff --git a/src/ubik/utst_client.c b/src/ubik/utst_client.c index 3852bd18b..9387a3533 100644 --- a/src/ubik/utst_client.c +++ b/src/ubik/utst_client.c @@ -24,13 +24,7 @@ RCSID #endif #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/ubik/utst_server.c b/src/ubik/utst_server.c index f832c263d..eab0cefe9 100644 --- a/src/ubik/utst_server.c +++ b/src/ubik/utst_server.c @@ -25,13 +25,7 @@ RCSID #endif #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/ubik/vote.c b/src/ubik/vote.c index 0a1f4f230..d61ef05e5 100644 --- a/src/ubik/vote.c +++ b/src/ubik/vote.c @@ -22,13 +22,7 @@ RCSID #endif #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/update/client.c b/src/update/client.c index b176aacb2..d88eb2eb3 100644 --- a/src/update/client.c +++ b/src/update/client.c @@ -36,13 +36,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/update/server.c b/src/update/server.c index a0689c8e0..f66edc0ce 100644 --- a/src/update/server.c +++ b/src/update/server.c @@ -31,13 +31,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/update/utils.c b/src/update/utils.c index 13d6b86c0..ae65ab414 100644 --- a/src/update/utils.c +++ b/src/update/utils.c @@ -22,13 +22,7 @@ RCSID #include #endif #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/usd/usd_file.c b/src/usd/usd_file.c index b9c73cfdd..93279b43f 100644 --- a/src/usd/usd_file.c +++ b/src/usd/usd_file.c @@ -31,13 +31,7 @@ RCSID #include #endif /* AFS_AIX_ENV */ -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include diff --git a/src/uss/grammar.y b/src/uss/grammar.y index 697a14d5f..a14828c43 100644 --- a/src/uss/grammar.y +++ b/src/uss/grammar.y @@ -11,14 +11,7 @@ #include #include #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif extern int line; extern int uss_perr; diff --git a/src/uss/lex.l b/src/uss/lex.l index 1c26d3fa4..c96ecec3a 100644 --- a/src/uss/lex.l +++ b/src/uss/lex.l @@ -14,13 +14,7 @@ RCSID("$Header$"); -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include "y.tab.h" #include "uss_common.h" diff --git a/src/uss/uss.c b/src/uss/uss.c index 0c6f2d682..a0759e914 100644 --- a/src/uss/uss.c +++ b/src/uss/uss.c @@ -25,13 +25,7 @@ RCSID #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#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 00737070b..734742695 100644 --- a/src/uss/uss_acl.c +++ b/src/uss/uss_acl.c @@ -30,13 +30,7 @@ RCSID #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #undef VIRTUE #undef VICE diff --git a/src/uss/uss_common.c b/src/uss/uss_common.c index 347e4f511..7cf2a9915 100644 --- a/src/uss/uss_common.c +++ b/src/uss/uss_common.c @@ -24,14 +24,7 @@ RCSID #include "uss_common.h" /*Interface definitions */ #include /*MAXKTCREALMLEN & MAXKTCNAMELEN */ - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif /* diff --git a/src/uss/uss_common.h b/src/uss/uss_common.h index 3b2f4ec40..ecfc630f7 100644 --- a/src/uss/uss_common.h +++ b/src/uss/uss_common.h @@ -23,13 +23,7 @@ #include /*I/O stuff */ #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif /* * --------------------- Exported definitions --------------------- diff --git a/src/uss/uss_fs.c b/src/uss/uss_fs.c index 232e76fcd..974992882 100644 --- a/src/uss/uss_fs.c +++ b/src/uss/uss_fs.c @@ -30,13 +30,7 @@ RCSID #endif #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include "uss_common.h" diff --git a/src/uss/uss_kauth.c b/src/uss/uss_kauth.c index cd82d33c2..d73508828 100644 --- a/src/uss/uss_kauth.c +++ b/src/uss/uss_kauth.c @@ -26,13 +26,7 @@ RCSID #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include /*MAXKTCREALMLEN*/ diff --git a/src/uss/uss_procs.c b/src/uss/uss_procs.c index e21cc6439..df9f49a12 100644 --- a/src/uss/uss_procs.c +++ b/src/uss/uss_procs.c @@ -33,13 +33,7 @@ RCSID #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include /*MAXKTCREALMLEN*/ #undef USS_PROCS_DB diff --git a/src/uss/uss_vol.c b/src/uss/uss_vol.c index b20ba4d1d..4b80876a9 100644 --- a/src/uss/uss_vol.c +++ b/src/uss/uss_vol.c @@ -30,13 +30,7 @@ RCSID #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include diff --git a/src/util/assert.c b/src/util/assert.c index 757d9768f..d953eaf63 100644 --- a/src/util/assert.c +++ b/src/util/assert.c @@ -14,13 +14,7 @@ #ifdef HAVE_SYS_TIME_H #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif RCSID ("$Header$"); diff --git a/src/util/casestrcpy.c b/src/util/casestrcpy.c index 4645d1f3b..8e8e0ce52 100644 --- a/src/util/casestrcpy.c +++ b/src/util/casestrcpy.c @@ -13,13 +13,7 @@ RCSID ("$Header$"); -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/util/fileutil.c b/src/util/fileutil.c index 8ff9449ac..e7e0c2d5f 100644 --- a/src/util/fileutil.c +++ b/src/util/fileutil.c @@ -20,6 +20,7 @@ RCSID #include #include #include +#include #ifdef AFS_NT40_ENV #include @@ -30,13 +31,6 @@ RCSID #ifdef HAVE_UNISTD_H #include #endif -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/util/get_krbrlm.c b/src/util/get_krbrlm.c index 2f9e7d2c8..21950b96a 100644 --- a/src/util/get_krbrlm.c +++ b/src/util/get_krbrlm.c @@ -10,6 +10,8 @@ RCSID ("$Header$"); #include +#include +#include #include "afsutil.h" /* diff --git a/src/util/hostparse.c b/src/util/hostparse.c index 2de608098..d48dc6de6 100644 --- a/src/util/hostparse.c +++ b/src/util/hostparse.c @@ -34,13 +34,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include "afsutil.h" #endif /* UKERNEL */ diff --git a/src/util/kreltime.c b/src/util/kreltime.c index 1ed7e730d..e89775a7b 100644 --- a/src/util/kreltime.c +++ b/src/util/kreltime.c @@ -19,13 +19,7 @@ RCSID #include "ktime.h" #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include "afsutil.h" diff --git a/src/util/ktime.c b/src/util/ktime.c index cf082f0e0..81256465f 100644 --- a/src/util/ktime.c +++ b/src/util/ktime.c @@ -20,13 +20,7 @@ RCSID #ifdef AFS_NT40_ENV #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include "afsutil.h" diff --git a/src/util/netutils.c b/src/util/netutils.c index 4ff10a027..ab1734499 100644 --- a/src/util/netutils.c +++ b/src/util/netutils.c @@ -24,13 +24,7 @@ RCSID #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #ifdef KERNEL #include "afs/sysincludes.h" diff --git a/src/util/serverLog.c b/src/util/serverLog.c index e54951757..62bc1da1a 100644 --- a/src/util/serverLog.c +++ b/src/util/serverLog.c @@ -37,13 +37,7 @@ RCSID #include /* signal(), kill(), wait(), etc. */ #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include "afsutil.h" #include "fileutil.h" diff --git a/src/util/snprintf.c b/src/util/snprintf.c index 8387257ca..ca511a1b8 100644 --- a/src/util/snprintf.c +++ b/src/util/snprintf.c @@ -10,6 +10,7 @@ RCSID #include #include #include +#include #ifndef AFS_NT40_ENV #include #include @@ -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 #endif -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #define MAXPREC 100 diff --git a/src/util/uuid.c b/src/util/uuid.c index 593a79a37..3972aaab3 100644 --- a/src/util/uuid.c +++ b/src/util/uuid.c @@ -60,6 +60,7 @@ RCSID #else /* KERNEL */ #include #include +#include #ifdef AFS_NT40_ENV #include #include @@ -73,13 +74,6 @@ RCSID #include #endif /* ITIMER_REAL */ #include -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/util/volparse.c b/src/util/volparse.c index 1ae83d167..a358da784 100644 --- a/src/util/volparse.c +++ b/src/util/volparse.c @@ -13,13 +13,7 @@ RCSID ("$Header$"); -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef HAVE_STDLIB_H #include #endif diff --git a/src/venus/cmdebug.c b/src/venus/cmdebug.c index d22ab73eb..f6b7b44bc 100644 --- a/src/venus/cmdebug.c +++ b/src/venus/cmdebug.c @@ -26,13 +26,7 @@ RCSID #include #endif #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef AFS_AIX32_ENV #include #endif diff --git a/src/venus/fs.c b/src/venus/fs.c index dfc21b724..9b947c89b 100644 --- a/src/venus/fs.c +++ b/src/venus/fs.c @@ -30,13 +30,7 @@ RCSID #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #undef VIRTUE #undef VICE diff --git a/src/venus/fstrace.c b/src/venus/fstrace.c index ef5dd1ff0..8d8f21e94 100644 --- a/src/venus/fstrace.c +++ b/src/venus/fstrace.c @@ -27,13 +27,7 @@ RCSID #undef abs #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include diff --git a/src/venus/livesys.c b/src/venus/livesys.c index ea121e70f..d7202a11e 100644 --- a/src/venus/livesys.c +++ b/src/venus/livesys.c @@ -22,13 +22,7 @@ RCSID #include #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/venus/up.c b/src/venus/up.c index 3bb74a0ed..884b4e7b8 100644 --- a/src/venus/up.c +++ b/src/venus/up.c @@ -42,13 +42,7 @@ RCSID #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include diff --git a/src/vfsck/dirutils.c b/src/vfsck/dirutils.c index f89332687..9b3246695 100644 --- a/src/vfsck/dirutils.c +++ b/src/vfsck/dirutils.c @@ -15,6 +15,7 @@ RCSID #include #include +#include #include #include diff --git a/src/vfsck/setup.c b/src/vfsck/setup.c index 19d7dce08..87a99d203 100644 --- a/src/vfsck/setup.c +++ b/src/vfsck/setup.c @@ -22,6 +22,7 @@ RCSID ("$Header$"); #include +#include #define VICE #if defined(AFS_SUN_ENV) || defined(AFS_OSF_ENV) diff --git a/src/vfsck/utilities.c b/src/vfsck/utilities.c index 27ea70706..4d42aa494 100644 --- a/src/vfsck/utilities.c +++ b/src/vfsck/utilities.c @@ -75,6 +75,7 @@ RCSID #endif /* AFS_OSF_ENV */ #include +#include #include #include "fsck.h" diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c index f879b5dc6..fa26512ac 100644 --- a/src/viced/afsfileprocs.c +++ b/src/viced/afsfileprocs.c @@ -47,14 +47,7 @@ RCSID #include #include #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifndef AFS_LINUX20_ENV #include diff --git a/src/viced/callback.c b/src/viced/callback.c index a9e81f618..82bdce2f5 100644 --- a/src/viced/callback.c +++ b/src/viced/callback.c @@ -90,6 +90,7 @@ RCSID #include #include /* for malloc() */ #include /* ANSI standard location for time stuff */ +#include #ifdef AFS_NT40_ENV #include #include @@ -97,13 +98,6 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include diff --git a/src/viced/fsprobe.c b/src/viced/fsprobe.c index 7e656869b..d65990fae 100644 --- a/src/viced/fsprobe.c +++ b/src/viced/fsprobe.c @@ -21,15 +21,7 @@ RCSID #include #include #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - struct ubik_client *cstruct; struct rx_connection *serverconns[MAXSERVERS]; diff --git a/src/viced/host.c b/src/viced/host.c index 9f42769d7..d3f808dd0 100644 --- a/src/viced/host.c +++ b/src/viced/host.c @@ -17,6 +17,7 @@ RCSID #include #include +#include #ifdef AFS_NT40_ENV #include #include @@ -26,14 +27,6 @@ RCSID #include #endif -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include #include #include diff --git a/src/viced/physio.c b/src/viced/physio.c index b3a6a16ff..678e2bd67 100644 --- a/src/viced/physio.c +++ b/src/viced/physio.c @@ -21,6 +21,7 @@ RCSID #include #include +#include #ifdef AFS_NT40_ENV #include #else @@ -28,13 +29,6 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/viced/viced.c b/src/viced/viced.c index 6526a377b..f251cdaf3 100644 --- a/src/viced/viced.c +++ b/src/viced/viced.c @@ -27,6 +27,7 @@ RCSID #include #include #include +#include #include #include /* signal(), kill(), wait(), etc. */ #include @@ -41,14 +42,6 @@ RCSID #include #include /* sysconf() */ -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #ifndef ITIMER_REAL #include #endif /* ITIMER_REAL */ diff --git a/src/vlserver/cnvldb.c b/src/vlserver/cnvldb.c index dbe42d5aa..237d0fd7a 100644 --- a/src/vlserver/cnvldb.c +++ b/src/vlserver/cnvldb.c @@ -18,14 +18,7 @@ RCSID #include #include #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include "cnvldb.h" /* CHANGEME! */ #include diff --git a/src/vlserver/vlclient.c b/src/vlserver/vlclient.c index 1408ae918..f73c6ed68 100644 --- a/src/vlserver/vlclient.c +++ b/src/vlserver/vlclient.c @@ -38,14 +38,7 @@ RCSID #include #endif #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include diff --git a/src/vlserver/vldb_check.c b/src/vlserver/vldb_check.c index ce574a70a..1e19a15bc 100644 --- a/src/vlserver/vldb_check.c +++ b/src/vlserver/vldb_check.c @@ -31,6 +31,7 @@ RCSID #include #include #include +#include #ifdef AFS_NT40_ENV #include #include @@ -41,14 +42,6 @@ RCSID #include #endif -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include "vlserver.h" #include "vldbint.h" #include diff --git a/src/vlserver/vlprocs.c b/src/vlserver/vlprocs.c index 97c8afb13..486f7907f 100644 --- a/src/vlserver/vlprocs.c +++ b/src/vlserver/vlprocs.c @@ -15,6 +15,7 @@ RCSID #include #include +#include #include #include #include @@ -25,13 +26,6 @@ RCSID #else #include #endif -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include "vlserver.h" #include "afs/audit.h" diff --git a/src/vlserver/vlserver.c b/src/vlserver/vlserver.c index 280086769..0b4e30751 100644 --- a/src/vlserver/vlserver.c +++ b/src/vlserver/vlserver.c @@ -17,6 +17,7 @@ RCSID #include #include #include +#include #ifdef HAVE_FCNTL_H #include #endif @@ -36,14 +37,6 @@ RCSID #endif #include -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include #include #include diff --git a/src/vlserver/vlutils.c b/src/vlserver/vlutils.c index 3eb2b454e..ce6a9a4aa 100644 --- a/src/vlserver/vlutils.c +++ b/src/vlserver/vlutils.c @@ -14,20 +14,13 @@ RCSID ("$Header$"); #include +#include #ifdef AFS_NT40_ENV #include #else #include #endif -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include #include #include diff --git a/src/vol/clone.c b/src/vol/clone.c index 263462437..432b3f24b 100644 --- a/src/vol/clone.c +++ b/src/vol/clone.c @@ -38,13 +38,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include diff --git a/src/vol/daemon_com.c b/src/vol/daemon_com.c index a14e25cda..49a69dcae 100644 --- a/src/vol/daemon_com.c +++ b/src/vol/daemon_com.c @@ -39,14 +39,7 @@ RCSID #include #include #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include diff --git a/src/vol/devname.c b/src/vol/devname.c index f614bc3b9..c06544a61 100644 --- a/src/vol/devname.c +++ b/src/vol/devname.c @@ -16,6 +16,7 @@ RCSID #include #include #include +#include #include #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 -#else -#ifdef HAVE_STRINGS_H -#include -#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 205a08953..7715bca8e 100644 --- a/src/vol/fssync-client.c +++ b/src/vol/fssync-client.c @@ -65,15 +65,7 @@ RCSID #include #endif /* AFS_PTHREAD_ENV */ #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include #include diff --git a/src/vol/fssync-server.c b/src/vol/fssync-server.c index 5ceacf3f4..8aa6e002d 100644 --- a/src/vol/fssync-server.c +++ b/src/vol/fssync-server.c @@ -74,15 +74,7 @@ RCSID #include #endif /* AFS_PTHREAD_ENV */ #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include #include diff --git a/src/vol/ihandle.c b/src/vol/ihandle.c index c502d339f..fa235fdda 100644 --- a/src/vol/ihandle.c +++ b/src/vol/ihandle.c @@ -20,6 +20,7 @@ RCSID #include #include #include +#include #ifdef AFS_NT40_ENV #include #else @@ -31,13 +32,7 @@ RCSID #include #endif #endif -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif + #include #include #include diff --git a/src/vol/listinodes.c b/src/vol/listinodes.c index 8342b1967..b2789c8d0 100644 --- a/src/vol/listinodes.c +++ b/src/vol/listinodes.c @@ -20,6 +20,8 @@ #include #include +#include + RCSID ("$Header$"); diff --git a/src/vol/partition.c b/src/vol/partition.c index 85a65779b..1e665fc53 100644 --- a/src/vol/partition.c +++ b/src/vol/partition.c @@ -25,6 +25,7 @@ RCSID ("$Header$"); #include +#include #ifdef AFS_NT40_ENV #include #include @@ -107,14 +108,6 @@ RCSID #include #endif -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include #include #include "nfs.h" diff --git a/src/vol/physio.c b/src/vol/physio.c index ac3eeb4c6..c463a4e7d 100644 --- a/src/vol/physio.c +++ b/src/vol/physio.c @@ -28,13 +28,7 @@ RCSID #else #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef AFS_SUN5_ENV #include #endif diff --git a/src/vol/purge.c b/src/vol/purge.c index 77695e390..87ecc99f3 100644 --- a/src/vol/purge.c +++ b/src/vol/purge.c @@ -28,13 +28,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include diff --git a/src/vol/salvsync-client.c b/src/vol/salvsync-client.c index 7ed96d6ee..c504fe081 100644 --- a/src/vol/salvsync-client.c +++ b/src/vol/salvsync-client.c @@ -35,15 +35,7 @@ RCSID #include #include #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include #include diff --git a/src/vol/salvsync-server.c b/src/vol/salvsync-server.c index e7549e9d3..70d2a4a7a 100644 --- a/src/vol/salvsync-server.c +++ b/src/vol/salvsync-server.c @@ -44,14 +44,7 @@ RCSID #include #include #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include diff --git a/src/vol/vnode.c b/src/vol/vnode.c index 75e90bd6a..e73a12ab8 100644 --- a/src/vol/vnode.c +++ b/src/vol/vnode.c @@ -24,13 +24,7 @@ RCSID #include #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef AFS_PTHREAD_ENV #include #else /* AFS_PTHREAD_ENV */ diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c index 764a2459a..7a814b9ef 100644 --- a/src/volser/dumpstuff.c +++ b/src/volser/dumpstuff.c @@ -17,6 +17,7 @@ RCSID #include #include #include +#include #ifdef AFS_NT40_ENV #include #else @@ -26,13 +27,6 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #ifdef AFS_PTHREAD_ENV #include diff --git a/src/volser/lockprocs.c b/src/volser/lockprocs.c index e83eb6561..e312ff135 100644 --- a/src/volser/lockprocs.c +++ b/src/volser/lockprocs.c @@ -26,13 +26,7 @@ RCSID #else #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/volser/physio.c b/src/volser/physio.c index 31cac6523..f285d7416 100644 --- a/src/volser/physio.c +++ b/src/volser/physio.c @@ -21,13 +21,7 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #ifdef AFS_SUN5_ENV #include #endif diff --git a/src/volser/restorevol.c b/src/volser/restorevol.c index 341c0d978..f43644757 100644 --- a/src/volser/restorevol.c +++ b/src/volser/restorevol.c @@ -64,14 +64,7 @@ RCSID #include #include #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif char rootdir[MAXPATHLEN]; diff --git a/src/volser/volmain.c b/src/volser/volmain.c index 29ccf2d1e..db10bc1a4 100644 --- a/src/volser/volmain.c +++ b/src/volser/volmain.c @@ -14,6 +14,7 @@ RCSID ("$Header$"); #include +#include #ifdef AFS_NT40_ENV #include #include @@ -24,13 +25,6 @@ RCSID #include #include #endif -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include #include #include diff --git a/src/volser/volprocs.c b/src/volser/volprocs.c index e1dd04334..321bf389e 100644 --- a/src/volser/volprocs.c +++ b/src/volser/volprocs.c @@ -15,6 +15,7 @@ RCSID #include #include +#include #include #ifdef AFS_NT40_ENV #include @@ -25,14 +26,6 @@ RCSID #include #endif -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include #include #include diff --git a/src/volser/voltrans.c b/src/volser/voltrans.c index 0ef9acba1..df5f20f03 100644 --- a/src/volser/voltrans.c +++ b/src/volser/voltrans.c @@ -29,6 +29,7 @@ RCSID #include #include #include +#include #ifdef AFS_NT40_ENV #include #include @@ -61,14 +62,6 @@ RCSID #include #include -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#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 bd64d64b9..c9193bbce 100644 --- a/src/volser/vos.c +++ b/src/volser/vos.c @@ -14,6 +14,7 @@ RCSID ("$Header$"); #include +#include #ifdef AFS_NT40_ENV #include #include @@ -31,14 +32,6 @@ RCSID #endif #include -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include #include #include diff --git a/src/volser/vsprocs.c b/src/volser/vsprocs.c index e6f508962..ec7c6396b 100644 --- a/src/volser/vsprocs.c +++ b/src/volser/vsprocs.c @@ -16,6 +16,7 @@ RCSID #include #include #include +#include #ifdef AFS_AIX_ENV #include #endif @@ -27,14 +28,6 @@ RCSID #include #endif -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include #include #include diff --git a/src/volser/vsutils.c b/src/volser/vsutils.c index 1aebfcc67..e74b9e321 100644 --- a/src/volser/vsutils.c +++ b/src/volser/vsutils.c @@ -14,6 +14,7 @@ RCSID ("$Header$"); #include +#include #ifdef AFS_NT40_ENV #include #include @@ -28,14 +29,6 @@ RCSID #include #endif -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif - #include #include #include diff --git a/src/xstat/xstat_cm.c b/src/xstat/xstat_cm.c index 109df3d48..c049ed373 100644 --- a/src/xstat/xstat_cm.c +++ b/src/xstat/xstat_cm.c @@ -24,14 +24,7 @@ RCSID #include /*Lightweight process package */ #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#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 95fb3bb5e..e6a8a548f 100644 --- 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 /*Command line interpreter */ #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#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 a3f7b67b4..2805b1207 100644 --- a/src/xstat/xstat_fs.c +++ b/src/xstat/xstat_fs.c @@ -24,14 +24,7 @@ RCSID #include /*Lightweight process package */ #include - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#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 6d05387b2..d580e9d2d 100644 --- a/src/xstat/xstat_fs_callback.c +++ b/src/xstat/xstat_fs_callback.c @@ -34,14 +34,7 @@ RCSID #include #include /*Standard I/O stuff */ - -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif #include /*Callback interface defs */ diff --git a/src/xstat/xstat_fs_test.c b/src/xstat/xstat_fs_test.c index 90c6cec3e..0c97afbb2 100644 --- 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 /*Command line interpreter */ #include -#ifdef HAVE_STRING_H #include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif /* * External routines that don't have explicit include file definitions. -- 2.39.5