[OpenAFS-devel] strings.h or strings.h
chas williams
chas@cmf.nrl.navy.mil
Fri, 03 Aug 2001 09:56:42 -0400
>> . just include both
>doesn't work on AIX.
really? if you look at some of the stuff in des (1.1.1 release) you
will see that it can include both string headers.
>if a patch shows up (and it doesn't break AIX again) it will be applied
>otherwise i'll get to it as soon as i can
what was broken on aix? we have a couple aches and pains boxes here that
i could the following patch against.
Index: src/auth/cellconfig.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/auth/cellconfig.c,v
retrieving revision 1.2
diff -u -u -r1.2 cellconfig.c
--- cellconfig.c 2001/08/02 23:25:13 1.2
+++ cellconfig.c 2001/08/03 13:48:43
@@ -41,11 +41,11 @@
#include <stdio.h>
#include <sys/stat.h>
#include <fcntl.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
#endif /* UKERNEL */
Index: src/auth/setkey.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/auth/setkey.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 setkey.c
--- setkey.c 2001/07/28 17:43:53 1.1.1.3
+++ setkey.c 2001/08/03 13:48:43
@@ -20,11 +20,11 @@
#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
Index: src/des/cksum.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/des/cksum.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 cksum.c
--- cksum.c 2001/07/28 17:45:03 1.1.1.3
+++ cksum.c 2001/08/03 13:48:43
@@ -24,11 +24,12 @@
#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>
Index: src/des/crypt.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/des/crypt.c,v
retrieving revision 1.2
diff -u -u -r1.2 crypt.c
--- crypt.c 2001/07/29 23:37:58 1.2
+++ crypt.c 2001/08/03 13:48:43
@@ -43,11 +43,12 @@
#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
/*
Index: src/des/new_rnd_key.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/des/new_rnd_key.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 new_rnd_key.c
--- new_rnd_key.c 2001/07/28 17:45:14 1.1.1.3
+++ new_rnd_key.c 2001/08/03 13:48:43
@@ -25,11 +25,12 @@
#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"
Index: src/des/read_pssword.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/des/read_pssword.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 read_pssword.c
--- read_pssword.c 2001/07/28 17:45:15 1.1.1.3
+++ read_pssword.c 2001/08/03 13:48:44
@@ -21,11 +21,12 @@
#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
Index: src/des/strng_to_key.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/des/strng_to_key.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 strng_to_key.c
--- strng_to_key.c 2001/07/28 17:45:15 1.1.1.3
+++ strng_to_key.c 2001/08/03 13:48:44
@@ -29,11 +29,12 @@
#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;
Index: src/des/weak_key.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/des/weak_key.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 weak_key.c
--- weak_key.c 2001/07/28 17:45:16 1.1.1.3
+++ weak_key.c 2001/08/03 13:48:44
@@ -19,11 +19,12 @@
#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
/*
Index: src/kauth/knfs.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/kauth/knfs.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 knfs.c
--- knfs.c 2001/07/28 17:45:54 1.1.1.3
+++ knfs.c 2001/08/03 13:48:44
@@ -26,6 +26,13 @@
#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>
Index: src/libacl/aclprocs.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/libacl/aclprocs.c,v
retrieving revision 1.2
diff -u -u -r1.2 aclprocs.c
--- aclprocs.c 2001/08/02 23:25:16 1.2
+++ aclprocs.c 2001/08/03 13:48:44
@@ -19,11 +19,11 @@
RCSID("$Header: /afs/cmf/project/cvsroot/openafs/src/libacl/aclprocs.c,v 1.2 2001/08/02 23:25:16 chas Exp $");
#include <sys/types.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
Index: src/libadmin/vos/afs_vosAdmin.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/libadmin/vos/afs_vosAdmin.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 afs_vosAdmin.c
--- afs_vosAdmin.c 2001/07/28 17:46:33 1.1.1.3
+++ afs_vosAdmin.c 2001/08/03 13:48:44
@@ -14,11 +14,11 @@
#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>
Index: src/libadmin/vos/lockprocs.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/libadmin/vos/lockprocs.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 lockprocs.c
--- lockprocs.c 2001/07/28 17:46:34 1.1.1.3
+++ lockprocs.c 2001/08/03 13:48:44
@@ -13,11 +13,11 @@
RCSID("$Header: /afs/cmf/project/cvsroot/openafs/src/libadmin/vos/lockprocs.c,v 1.1.1.3 2001/07/28 17:46:34 chas Exp $");
#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
Index: src/libadmin/vos/vosutils.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/libadmin/vos/vosutils.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 vosutils.c
--- vosutils.c 2001/07/28 17:46:35 1.1.1.3
+++ vosutils.c 2001/08/03 13:48:44
@@ -16,11 +16,11 @@
#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
Index: src/libadmin/vos/vsprocs.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/libadmin/vos/vsprocs.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 vsprocs.c
--- vsprocs.c 2001/07/28 17:46:36 1.1.1.3
+++ vsprocs.c 2001/08/03 13:48:44
@@ -29,11 +29,11 @@
#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
Index: src/lwp/threadname.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/lwp/threadname.c,v
retrieving revision 1.1.1.2
diff -u -u -r1.1.1.2 threadname.c
--- threadname.c 2001/07/28 17:46:56 1.1.1.2
+++ threadname.c 2001/08/03 13:48:44
@@ -24,11 +24,11 @@
RCSID("$Header: /afs/cmf/project/cvsroot/openafs/src/lwp/threadname.c,v 1.1.1.2 2001/07/28 17:46:56 chas Exp $");
-#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)
Index: src/rx/rx.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/rx/rx.c,v
retrieving revision 1.1.1.6
diff -u -u -r1.1.1.6 rx.c
--- rx.c 2001/07/28 17:47:33 1.1.1.6
+++ rx.c 2001/08/03 13:48:44
@@ -88,11 +88,11 @@
# 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"
Index: src/rx/rx_misc.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/rx/rx_misc.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 rx_misc.c
--- rx_misc.c 2001/07/28 17:47:39 1.1.1.3
+++ rx_misc.c 2001/08/03 13:48:44
@@ -29,11 +29,11 @@
#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
Index: src/rx/rx_packet.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/rx/rx_packet.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 rx_packet.c
--- rx_packet.c 2001/07/28 17:47:41 1.1.1.3
+++ rx_packet.c 2001/08/03 13:48:44
@@ -77,11 +77,11 @@
#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
Index: src/rx/rx_rdwr.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/rx/rx_rdwr.c,v
retrieving revision 1.1.1.4
diff -u -u -r1.1.1.4 rx_rdwr.c
--- rx_rdwr.c 2001/07/28 17:47:42 1.1.1.4
+++ rx_rdwr.c 2001/08/03 13:48:44
@@ -72,11 +72,11 @@
# 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
Index: src/rx/rx_trace.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/rx/rx_trace.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 rx_trace.c
--- rx_trace.c 2001/07/28 17:47:43 1.1.1.3
+++ rx_trace.c 2001/08/03 13:48:44
@@ -13,11 +13,11 @@
RCSID("$Header: /afs/cmf/project/cvsroot/openafs/src/rx/rx_trace.c,v 1.1.1.3 2001/07/28 17:47:43 chas Exp $");
#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
Index: src/rx/rx_user.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/rx/rx_user.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 rx_user.c
--- rx_user.c 2001/07/28 17:47:44 1.1.1.3
+++ rx_user.c 2001/08/03 13:48:44
@@ -35,11 +35,11 @@
#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
Index: src/rx/rxdebug.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/rx/rxdebug.c,v
retrieving revision 1.1.1.4
diff -u -u -r1.1.1.4 rxdebug.c
--- rxdebug.c 2001/07/28 17:47:45 1.1.1.4
+++ rxdebug.c 2001/08/03 13:48:44
@@ -30,11 +30,11 @@
#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>
Index: src/rxgen/rpc_cout.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/rxgen/rpc_cout.c,v
retrieving revision 1.1.1.2
diff -u -u -r1.1.1.2 rpc_cout.c
--- rpc_cout.c 2001/07/28 17:48:04 1.1.1.2
+++ rpc_cout.c 2001/08/03 13:48:44
@@ -39,11 +39,11 @@
#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"
Index: src/rxgen/rpc_main.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/rxgen/rpc_main.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 rpc_main.c
--- rpc_main.c 2001/07/28 17:48:05 1.1.1.3
+++ rpc_main.c 2001/08/03 13:48:44
@@ -42,11 +42,11 @@
#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
Index: src/rxgen/rpc_parse.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/rxgen/rpc_parse.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 rpc_parse.c
--- rpc_parse.c 2001/07/28 17:48:05 1.1.1.3
+++ rpc_parse.c 2001/08/03 13:48:44
@@ -40,11 +40,11 @@
#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"
Index: src/rxgen/rpc_scan.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/rxgen/rpc_scan.c,v
retrieving revision 1.1.1.2
diff -u -u -r1.1.1.2 rpc_scan.c
--- rpc_scan.c 2001/07/28 17:48:06 1.1.1.2
+++ rpc_scan.c 2001/08/03 13:48:44
@@ -40,11 +40,11 @@
#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"
Index: src/rxgen/rpc_svcout.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/rxgen/rpc_svcout.c,v
retrieving revision 1.1.1.2
diff -u -u -r1.1.1.2 rpc_svcout.c
--- rpc_svcout.c 2001/07/28 17:48:07 1.1.1.2
+++ rpc_svcout.c 2001/08/03 13:48:44
@@ -38,11 +38,11 @@
RCSID("$Header: /afs/cmf/project/cvsroot/openafs/src/rxgen/rpc_svcout.c,v 1.1.1.2 2001/07/28 17:48:07 chas Exp $");
#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"
Index: src/rxgen/rpc_util.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/rxgen/rpc_util.c,v
retrieving revision 1.2
diff -u -u -r1.2 rpc_util.c
--- rpc_util.c 2001/07/29 16:23:04 1.2
+++ rpc_util.c 2001/08/03 13:48:44
@@ -39,11 +39,11 @@
#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 "rpc_scan.h"
Index: src/ubik/recovery.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/ubik/recovery.c,v
retrieving revision 1.2
diff -u -u -r1.2 recovery.c
--- recovery.c 2001/08/02 23:25:19 1.2
+++ recovery.c 2001/08/03 13:48:44
@@ -21,11 +21,11 @@
#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 <assert.h>
@@ -33,6 +33,7 @@
#include <rx/xdr.h>
#include <rx/rx.h>
#include <errno.h>
+#include <afs/afsutil.h>
#define UBIK_INTERNALS
#include "ubik.h"
Index: src/ubik/udebug.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/ubik/udebug.c,v
retrieving revision 1.1.1.4
diff -u -u -r1.1.1.4 udebug.c
--- udebug.c 2001/07/28 17:48:32 1.1.1.4
+++ udebug.c 2001/08/03 13:48:44
@@ -14,11 +14,11 @@
#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
Index: src/update/client.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/update/client.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 client.c
--- client.c 2001/07/28 17:48:34 1.1.1.3
+++ client.c 2001/08/03 13:48:44
@@ -35,11 +35,11 @@
#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
Index: src/update/server.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/update/server.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 server.c
--- server.c 2001/07/28 17:48:35 1.1.1.3
+++ server.c 2001/08/03 13:48:44
@@ -30,11 +30,11 @@
#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
Index: src/update/utils.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/update/utils.c,v
retrieving revision 1.1.1.3
diff -u -u -r1.1.1.3 utils.c
--- utils.c 2001/07/28 17:48:36 1.1.1.3
+++ utils.c 2001/08/03 13:48:44
@@ -21,11 +21,11 @@
#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
Index: src/util/hostparse.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/util/hostparse.c,v
retrieving revision 1.1.1.4
diff -u -u -r1.1.1.4 hostparse.c
--- hostparse.c 2001/07/28 17:48:50 1.1.1.4
+++ hostparse.c 2001/08/03 13:48:44
@@ -33,11 +33,11 @@
#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>
Index: src/util/netutils.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/util/netutils.c,v
retrieving revision 1.1.1.4
diff -u -u -r1.1.1.4 netutils.c
--- netutils.c 2001/07/28 17:48:53 1.1.1.4
+++ netutils.c 2001/08/03 13:48:44
@@ -23,11 +23,11 @@
#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>
Index: src/util/serverLog.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/util/serverLog.c,v
retrieving revision 1.1.1.4
diff -u -u -r1.1.1.4 serverLog.c
--- serverLog.c 2001/07/28 17:48:56 1.1.1.4
+++ serverLog.c 2001/08/03 13:48:44
@@ -36,11 +36,11 @@
#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"
Index: src/util/volparse.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/util/volparse.c,v
retrieving revision 1.1.1.4
diff -u -u -r1.1.1.4 volparse.c
--- volparse.c 2001/07/28 17:48:57 1.1.1.4
+++ volparse.c 2001/08/03 13:48:44
@@ -12,11 +12,11 @@
RCSID("$Header: /afs/cmf/project/cvsroot/openafs/src/util/volparse.c,v 1.1.1.4 2001/07/28 17:48:57 chas Exp $");
-#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
Index: src/vol/devname.c
===================================================================
RCS file: /afs/cmf/project/cvsroot/openafs/src/vol/devname.c,v
retrieving revision 1.2
diff -u -u -r1.2 devname.c
--- devname.c 2001/08/02 23:25:22 1.2
+++ devname.c 2001/08/03 13:48:44
@@ -16,11 +16,11 @@
#include <rx/xdr.h>
#include <afs/afsint.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
#if !defined(AFS_SGI_ENV)