invert-sense-of-strings-string-header-inclusion-20010806

this will be obsolete in current form once b* and *index are dead but apply
for now

diff --git a/src/auth/setkey.c b/src/auth/setkey.c
index 07d2f1669708285cad151a1b984b80e616768fd8..fe05205a6f10bb79e06e012ec9eb43d8473cdb09 100644 (file)
--- a/src/auth/setkey.c
+++ b/src/auth/setkey.c
@@ -20,11 +20,11 @@ RCSID("$Header$");
 #include <WINNT/afsreg.h>
 #include <WINNT/afsevent.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_NETINET_IN_H

diff --git a/src/des/cksum.c b/src/des/cksum.c
index 65734f55e87cc7084c78361c9b60b9f299dfd6e3..8d42fb30ffef3971639fb7d0e756b6eff9cdd3d9 100644 (file)
--- a/src/des/cksum.c
+++ b/src/des/cksum.c
@@ -24,11 +24,12 @@ RCSID("$Header$");
 
 #include <mit-cpyright.h>
 #include <stdio.h>
-#if defined(HAVE_STRINGS_H)
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if defined(HAVE_STRING_H)
-#include <string.h>
 #endif
 
 #include <des.h>

diff --git a/src/des/crypt.c b/src/des/crypt.c
index bd6e9f9a2a9c6809f1daa5373182fe80e732e922..ccc816d9008d9d271c87812191d5562c3b0ea678 100644 (file)
--- a/src/des/crypt.c
+++ b/src/des/crypt.c
@@ -43,11 +43,12 @@ RCSID("$Header$");
 #include <windows.h>
 #endif
 #include <stdlib.h>
-#if defined(HAVE_STRINGS_H)
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if defined(HAVE_STRING_H)
-#include <string.h>
 #endif
 
 /*

diff --git a/src/des/new_rnd_key.c b/src/des/new_rnd_key.c
index b87223eaf7d3c7faa4f61974eeaa04c1d222e100..304cf9c674941eb7724c884d242ad70f83f279ef 100644 (file)
--- a/src/des/new_rnd_key.c
+++ b/src/des/new_rnd_key.c
@@ -25,11 +25,12 @@ RCSID("$Header$");
 #ifdef AFS_PTHREAD_ENV
 #include <pthread.h>
 #endif
-#if defined(HAVE_STRINGS_H)
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if defined(HAVE_STRING_H)
-#include <string.h>
 #endif
 #include "stats.h"
 

diff --git a/src/des/read_pssword.c b/src/des/read_pssword.c
index eebdc3fd43bb0ee6ddf257b127b02c46593411ac..b10972f1146eb579cc81d0811e2247e38d3615ba 100644 (file)
--- a/src/des/read_pssword.c
+++ b/src/des/read_pssword.c
@@ -21,11 +21,12 @@ RCSID("$Header$");
 #include "conf.h"
 
 #include <stdio.h>
-#if defined(HAVE_STRINGS_H)
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if defined(HAVE_STRING_H)
-#include <string.h>
 #endif
 
 #ifdef BSDUNIX

diff --git a/src/des/strng_to_key.c b/src/des/strng_to_key.c
index 176f1e68180bbaef17181e0bd999af5a512a6906..70d2651819d910c373362f8222d0b5c81e0e9b49 100644 (file)
--- a/src/des/strng_to_key.c
+++ b/src/des/strng_to_key.c
@@ -29,11 +29,12 @@ RCSID("$Header$");
 
 #include <des.h>
 #include "des_internal.h"
-#if defined(HAVE_STRINGS_H)
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if defined(HAVE_STRING_H)
-#include <string.h>
 #endif
 
 extern int des_debug;

diff --git a/src/des/weak_key.c b/src/des/weak_key.c
index bd7afca5180323be388287e40e1fb6251ef5c1c1..a00bbd49f690d1ba06d7dd0e14defbe0b23b9c3a 100644 (file)
--- a/src/des/weak_key.c
+++ b/src/des/weak_key.c
@@ -19,11 +19,12 @@ RCSID("$Header$");
 
 #include <des.h>
 #include "des_internal.h"
-#if defined(HAVE_STRINGS_H)
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#if defined(HAVE_STRING_H)
-#include <string.h>
 #endif
 
 /*

diff --git a/src/kauth/knfs.c b/src/kauth/knfs.c
index 79eaeecdbb2bf44879c416f7b1f157fe826d79fb..dff7d57ddbc6b4f16fa508f7ff8a190d21e88e36 100644 (file)
--- a/src/kauth/knfs.c
+++ b/src/kauth/knfs.c
@@ -26,6 +26,13 @@ RCSID("$Header$");
 #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/libadmin/vos/afs_vosAdmin.c b/src/libadmin/vos/afs_vosAdmin.c
index 58d8c74a30688f1987e4fcd830f63c9480beb3e0..9a17725b5bd6536a330dd33972dbfd8e703f2552 100644 (file)
--- a/src/libadmin/vos/afs_vosAdmin.c
+++ b/src/libadmin/vos/afs_vosAdmin.c
@@ -14,11 +14,11 @@ RCSID("$Header$");
 
 #include <afs/stds.h>
 #include <stdio.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #include <ctype.h>

diff --git a/src/libadmin/vos/lockprocs.c b/src/libadmin/vos/lockprocs.c
index 0e27b51b615f157fe8625f5331a028566d3ba165..16a01a5369245f6a090a20a8a96458a242666c35 100644 (file)
--- a/src/libadmin/vos/lockprocs.c
+++ b/src/libadmin/vos/lockprocs.c
@@ -13,11 +13,11 @@
 RCSID("$Header$");
 
 #include "lockprocs.h"
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 

diff --git a/src/libadmin/vos/vosutils.c b/src/libadmin/vos/vosutils.c
index 4be8c83b9b8d5aec4d46f1b51c932bfee0224f86..1ee1a2a311037e810ab63d15a669e4570fc80246 100644 (file)
--- a/src/libadmin/vos/vosutils.c
+++ b/src/libadmin/vos/vosutils.c
@@ -16,11 +16,11 @@ RCSID("$Header$");
 #include "vsprocs.h"
 #include "lockprocs.h"
 #include <afs/afs_AdminErrors.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 

diff --git a/src/libadmin/vos/vsprocs.c b/src/libadmin/vos/vsprocs.c
index e41b9c8c4e85ae46b4b0deb614489725e3a1a9a9..d7e86129a9d78f2c669136cc49fe9691a4e04cc0 100644 (file)
--- a/src/libadmin/vos/vsprocs.c
+++ b/src/libadmin/vos/vsprocs.c
@@ -29,11 +29,11 @@ RCSID("$Header$");
 #include "../adminutil/afs_AdminInternal.h"
 #include <afs/afs_AdminErrors.h>
 #include "afs_vosAdmin.h"
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_UNISTD_H

diff --git a/src/lwp/threadname.c b/src/lwp/threadname.c
index f5d654c66f99d6f5f535bb9ce74297ed34de920c..a003694a3201bacb68803dfc8088be7e7274cc0a 100644 (file)
--- a/src/lwp/threadname.c
+++ b/src/lwp/threadname.c
@@ -24,11 +24,11 @@
 
 RCSID("$Header$");
 
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #if defined(AFS_PTHREAD_ENV)

diff --git a/src/rx/rx.c b/src/rx/rx.c
index c6f41284b8e73c17b3e49d3a538e41bcbbdbe976..57c548b2ed8aa9848938ea7c05159651c3fdec62 100644 (file)
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -88,11 +88,11 @@ extern afs_int32 afs_termState;
 # include <netinet/in.h>
 # include <sys/time.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 # include "rx.h"

diff --git a/src/rx/rx_misc.c b/src/rx/rx_misc.c
index e281cb5239cf892eb6f6199f803d717f5b120df0..196a458c1fb61e4d0f68c2daeade35a17e19fe86 100644 (file)
--- a/src/rx/rx_misc.c
+++ b/src/rx/rx_misc.c
@@ -29,11 +29,11 @@ RCSID("$Header$");
 #include "rx.h"
 #endif /* AFS_PTHREAD_ENV */
 #include <stdlib.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_UNISTD_H

diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c
index ce17d1ee4db38d6c7885f24fb2cdf6135f54cf1d..371b6f517f468f1f7592b32834de1f3b892720ed 100644 (file)
--- a/src/rx/rx_packet.c
+++ b/src/rx/rx_packet.c
@@ -77,11 +77,11 @@ RCSID("$Header$");
 #include "rx_globals.h"
 #include <lwp.h>
 #include "rx_internal.h"
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_UNISTD_H

diff --git a/src/rx/rx_rdwr.c b/src/rx/rx_rdwr.c
index 53d4f9ee4ae900519310a6d939f252e189dec44f..7464826f3efbe3b3e2a13f46a8f35b7620410f7e 100644 (file)
--- a/src/rx/rx_rdwr.c
+++ b/src/rx/rx_rdwr.c
@@ -72,11 +72,11 @@ RCSID("$Header$");
 # include <sys/stat.h>
 # include <sys/time.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_UNISTD_H

diff --git a/src/rx/rx_trace.c b/src/rx/rx_trace.c
index e3801fe5257a69ec3fa20e5bf89bdef6f6824743..3fd94f0ed03dfe8de4ba0aa024471d0d330d0079 100644 (file)
--- a/src/rx/rx_trace.c
+++ b/src/rx/rx_trace.c
@@ -13,11 +13,11 @@
 RCSID("$Header$");
 
 #ifdef RXDEBUG
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef AFS_NT40_ENV

diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c
index a276e7f27d6bb4d0effe73c5687feda01c33e337..f39d0e2b0c72289d7da09f891e94b44e9c8b9829 100644 (file)
--- a/src/rx/rx_user.c
+++ b/src/rx/rx_user.c
@@ -35,11 +35,11 @@ RCSID("$Header$");
 #endif
 #include <afs/afs_args.h>
 #include <afs/afsutil.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 

diff --git a/src/rx/rxdebug.c b/src/rx/rxdebug.c
index cf8b161b6c4efe70fec2061b6a16e0acd1ba2e8a..7e525ae2195096e650bdf976a1a298d2c2b73804 100644 (file)
--- a/src/rx/rxdebug.c
+++ b/src/rx/rxdebug.c
@@ -30,11 +30,11 @@ RCSID("$Header$");
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <string.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #include <sys/stat.h>

diff --git a/src/rxgen/rpc_cout.c b/src/rxgen/rpc_cout.c
index 9b0688be426bac4a576da648ccda8ca98c4036f7..1742e5460a1736001b4051ea9daae61650d35b8b 100644 (file)
--- a/src/rxgen/rpc_cout.c
+++ b/src/rxgen/rpc_cout.c
@@ -39,11 +39,11 @@ RCSID("$Header$");
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #include "rpc_util.h"

diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c
index 0f2f577c8387fdd5b0189c36151c6ead360042ee..98850613db9a8ab281dcf312b917fd3129aac304 100644 (file)
--- a/src/rxgen/rpc_main.c
+++ b/src/rxgen/rpc_main.c
@@ -42,11 +42,11 @@ RCSID("$Header$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_SIGNAL_H

diff --git a/src/rxgen/rpc_parse.c b/src/rxgen/rpc_parse.c
index 20f2fd454816c5bcc02f784a90acd2be869c426e..c086323905dfb952f24b3f38a5c41b92fd983b52 100644 (file)
--- a/src/rxgen/rpc_parse.c
+++ b/src/rxgen/rpc_parse.c
@@ -40,11 +40,11 @@ RCSID("$Header$");
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #include "rpc_util.h"

diff --git a/src/rxgen/rpc_scan.c b/src/rxgen/rpc_scan.c
index 6dc769e50cc0c4f13713170070ec5955908e3db6..1e1713fda130473bdf2bd0522942cbe7c5c33c66 100644 (file)
--- a/src/rxgen/rpc_scan.c
+++ b/src/rxgen/rpc_scan.c
@@ -40,11 +40,11 @@ RCSID("$Header$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #include "rpc_scan.h"

diff --git a/src/rxgen/rpc_svcout.c b/src/rxgen/rpc_svcout.c
index e92d59fcb57bf1238996d771f396a56a6296b223..71c3a875d9d165fda9493306468b3b020f693459 100644 (file)
--- a/src/rxgen/rpc_svcout.c
+++ b/src/rxgen/rpc_svcout.c
@@ -38,11 +38,11 @@
 RCSID("$Header$");
 
 #include <stdio.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #include "rpc_parse.h"

diff --git a/src/rxgen/rpc_util.c b/src/rxgen/rpc_util.c
index 453d1785fae4191b188652374cb798b10bbf755c..579b5146221f34498a7892726657e1ea41ada550 100644 (file)
--- a/src/rxgen/rpc_util.c
+++ b/src/rxgen/rpc_util.c
@@ -38,11 +38,11 @@
 RCSID("$Header$");
 
 #include <stdio.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #include "rpc_scan.h"

diff --git a/src/ubik/recovery.c b/src/ubik/recovery.c
index 4514eb4b40c2b3175b8b359cc6fc87a05616356c..4fd0e20abd4928f543ec050f5de41671d21dae8c 100644 (file)
--- a/src/ubik/recovery.c
+++ b/src/ubik/recovery.c
@@ -26,6 +26,7 @@ RCSID("$Header$");
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <errno.h>
+#include <afs/afsutil.h>
 
 #define UBIK_INTERNALS
 #include "ubik.h"

diff --git a/src/ubik/udebug.c b/src/ubik/udebug.c
index 091fee5728e70f58d3da2bf72bee8c3b03655971..2e27e41047328db5ab966705b42af415db579235 100644 (file)
--- a/src/ubik/udebug.c
+++ b/src/ubik/udebug.c
@@ -14,11 +14,11 @@ RCSID("$Header$");
 
 #include <sys/types.h>
 #include <stdlib.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef AFS_NT40_ENV

diff --git a/src/update/client.c b/src/update/client.c
index ccbaadfa01742a789870ecfb72ec643b0b1a7556..978b0fc0484454f726f27f2c4e0206b3ef813153 100644 (file)
--- a/src/update/client.c
+++ b/src/update/client.c
@@ -35,11 +35,11 @@ RCSID("$Header$");
 #include <sys/time.h>
 #include <dirent.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_UNISTD_H

diff --git a/src/update/server.c b/src/update/server.c
index 7d4afea3a1ab777fe175649c2e9d3c863ab5756d..8f22b9ebb9596aee832c8fad09d36a07e72d7d51 100644 (file)
--- a/src/update/server.c
+++ b/src/update/server.c
@@ -30,11 +30,11 @@ RCSID("$Header$");
 #include <sys/file.h>
 #include <dirent.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_UNISTD_H

diff --git a/src/update/utils.c b/src/update/utils.c
index 84314307b20c2d0451270d67fbd9c5d0de149857..3b05b51c8452a470d0f3a42ba2fe8eb05f02e9bb 100644 (file)
--- a/src/update/utils.c
+++ b/src/update/utils.c
@@ -21,11 +21,11 @@ RCSID("$Header$");
 #include <WINNT/afssw.h>
 #endif
 #include <stdio.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_UNISTD_H

diff --git a/src/util/hostparse.c b/src/util/hostparse.c
index ccd627874db979f3600a53a4a9b79b78a96e7496..ef77c5f90575c874f720df5281e0f833d727e6d7 100644 (file)
--- a/src/util/hostparse.c
+++ b/src/util/hostparse.c
@@ -33,11 +33,11 @@ RCSID("$Header$");
 #include <netdb.h>
 #include <ctype.h>
 #endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #include <errno.h>

diff --git a/src/util/netutils.c b/src/util/netutils.c
index 0d5ba37128f1a0585abaad0fef284d7e14391882..e4c85cb24078dc0fabe036e32e5b2df45e156bff 100644 (file)
--- a/src/util/netutils.c
+++ b/src/util/netutils.c
@@ -23,11 +23,11 @@ RCSID("$Header$");
 
 #include <stdlib.h>
 #include <stdio.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #include <ctype.h>

diff --git a/src/util/serverLog.c b/src/util/serverLog.c
index e9e561170c90ab84978525146dc3fa600b0d090a..9bad59b379e0318b934e9a772ebe5c2bf13f3bdf 100644 (file)
--- a/src/util/serverLog.c
+++ b/src/util/serverLog.c
@@ -36,11 +36,11 @@ RCSID("$Header$");
 #include <afs/procmgmt.h>  /* signal(), kill(), wait(), etc. */
 #include <fcntl.h>
 #include <afs/stds.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #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/volparse.c b/src/util/volparse.c
index 17e92f650a97793d32aea2b474a7577cf14fdf4a..09edb2a0a46db6bf1fc817c42a1bc43b13d4ce69 100644 (file)
--- a/src/util/volparse.c
+++ b/src/util/volparse.c
@@ -12,11 +12,11 @@
 
 RCSID("$Header$");
 
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
 #endif
 #endif
 #ifdef HAVE_STDLIB_H