From: Derrick Brashear Date: Thu, 28 Jun 2001 17:05:56 +0000 (+0000) Subject: aix-strings-h-preferred-over-string-h-20010628 X-Git-Tag: openafs-stable-1_1_0~78 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=fcc1a29b4e5f71ac90fb022414af5ae6554b23c1;p=packages%2Fo%2Fopenafs.git aix-strings-h-preferred-over-string-h-20010628 otherwise we get weird errors like: "/usr/include/strings.h", line 52.20: 1506-010 (W) Macro index invoked with a null argument for parameter __s1. "/usr/include/strings.h", line 52.20: 1506-041 (E) The invocation of macro index contains fewer arguments than required by the macro definition. "/usr/include/strings.h", line 52.14: 1506-275 (S) Unexpected text ',' encountered. from the conflict ==================== This delta was composed from multiple commits as part of the CVS->Git migration. The checkin message with each commit was inconsistent. The following are the additional commit messages. ==================== to prevent more of same errors ==================== ==================== continue to placate aix hatred ==================== aix needs more help ==================== aix needs more help --- diff --git a/src/libadmin/vos/afs_vosAdmin.c b/src/libadmin/vos/afs_vosAdmin.c index c8558a7c2..3256a951f 100644 --- a/src/libadmin/vos/afs_vosAdmin.c +++ b/src/libadmin/vos/afs_vosAdmin.c @@ -11,11 +11,12 @@ #include #include #include +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif #include #ifdef AFS_NT40_ENV diff --git a/src/libadmin/vos/lockprocs.c b/src/libadmin/vos/lockprocs.c index ff00e1a94..1473c6ab8 100644 --- a/src/libadmin/vos/lockprocs.c +++ b/src/libadmin/vos/lockprocs.c @@ -8,11 +8,12 @@ */ #include "lockprocs.h" +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif /* Finds an index in VLDB entry that matches the volume type, server, and partition. diff --git a/src/libadmin/vos/vosutils.c b/src/libadmin/vos/vosutils.c index ef927ef51..de907518c 100644 --- a/src/libadmin/vos/vosutils.c +++ b/src/libadmin/vos/vosutils.c @@ -13,10 +13,11 @@ #include #ifdef HAVE_STRINGS_H #include -#endif +#else #ifdef HAVE_STRING_H #include #endif +#endif /* * Functions that aren't prototyped, but that we use diff --git a/src/libadmin/vos/vsprocs.c b/src/libadmin/vos/vsprocs.c index 36b049d83..fccdf8681 100644 --- a/src/libadmin/vos/vsprocs.c +++ b/src/libadmin/vos/vsprocs.c @@ -24,11 +24,12 @@ #include "../adminutil/afs_AdminInternal.h" #include #include "afs_vosAdmin.h" +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif #ifdef HAVE_UNISTD_H #include diff --git a/src/lwp/threadname.c b/src/lwp/threadname.c index e888836f7..c9df424f4 100644 --- a/src/lwp/threadname.c +++ b/src/lwp/threadname.c @@ -21,11 +21,12 @@ #include #include +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif #if defined(AFS_PTHREAD_ENV) #include diff --git a/src/rx/rx.c b/src/rx/rx.c index 5337a508e..1b2fd0a2d 100644 --- a/src/rx/rx.c +++ b/src/rx/rx.c @@ -83,11 +83,12 @@ extern afs_int32 afs_termState; # include # include #endif +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif # include "rx.h" # include "rx_user.h" diff --git a/src/rx/rx_misc.c b/src/rx/rx_misc.c index 452715e65..555c549bb 100644 --- a/src/rx/rx_misc.c +++ b/src/rx/rx_misc.c @@ -26,11 +26,12 @@ #include "rx.h" #endif /* AFS_PTHREAD_ENV */ #include +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif #ifdef HAVE_UNISTD_H #include diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c index fa35d93dd..30323847a 100644 --- a/src/rx/rx_packet.c +++ b/src/rx/rx_packet.c @@ -72,11 +72,12 @@ #include "rx_globals.h" #include #include "rx_internal.h" +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif #ifdef HAVE_UNISTD_H #include diff --git a/src/rx/rx_rdwr.c b/src/rx/rx_rdwr.c index 358c396a8..e3d68e4e8 100644 --- a/src/rx/rx_rdwr.c +++ b/src/rx/rx_rdwr.c @@ -67,11 +67,12 @@ # include # include #endif +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif #ifdef HAVE_UNISTD_H #include diff --git a/src/rx/rx_trace.c b/src/rx/rx_trace.c index 40f43d49b..888bb5098 100644 --- a/src/rx/rx_trace.c +++ b/src/rx/rx_trace.c @@ -11,11 +11,12 @@ #include #include +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif #ifdef AFS_NT40_ENV #include diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c index 5820e9ad8..490568d8e 100644 --- a/src/rx/rx_user.c +++ b/src/rx/rx_user.c @@ -34,10 +34,11 @@ #include #ifdef HAVE_STRINGS_H #include -#endif +#else #ifdef HAVE_STRING_H #include #endif +#endif #ifndef IPPORT_USERRESERVED /* If in.h doesn't define this, define it anyway. Unfortunately, defining diff --git a/src/rx/rxdebug.c b/src/rx/rxdebug.c index 627912b2c..6db38b725 100644 --- a/src/rx/rxdebug.c +++ b/src/rx/rxdebug.c @@ -27,11 +27,12 @@ #ifdef HAVE_UNISTD_H #include #endif +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif #include #include diff --git a/src/rxgen/rpc_cout.c b/src/rxgen/rpc_cout.c index e529e8b44..8bdcf6208 100644 --- a/src/rxgen/rpc_cout.c +++ b/src/rxgen/rpc_cout.c @@ -36,11 +36,12 @@ #include #include #include +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif #include "rpc_util.h" #include "rpc_parse.h" diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c index 01ad71b1c..b1b3620af 100644 --- a/src/rxgen/rpc_main.c +++ b/src/rxgen/rpc_main.c @@ -39,11 +39,12 @@ #include #include #include +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif #ifdef HAVE_SIGNAL_H #include diff --git a/src/rxgen/rpc_parse.c b/src/rxgen/rpc_parse.c index e3654eaa0..8ae4bdca5 100644 --- a/src/rxgen/rpc_parse.c +++ b/src/rxgen/rpc_parse.c @@ -37,12 +37,12 @@ #include #include #include -#include +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif #include "rpc_util.h" #include "rpc_scan.h" diff --git a/src/rxgen/rpc_scan.c b/src/rxgen/rpc_scan.c index d2d390d0d..979079aa6 100644 --- a/src/rxgen/rpc_scan.c +++ b/src/rxgen/rpc_scan.c @@ -37,11 +37,12 @@ #include #include #include +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif #include "rpc_scan.h" #include "rpc_util.h" diff --git a/src/rxgen/rpc_svcout.c b/src/rxgen/rpc_svcout.c index 5724ba813..ef0794597 100644 --- a/src/rxgen/rpc_svcout.c +++ b/src/rxgen/rpc_svcout.c @@ -35,11 +35,12 @@ #include #include #include +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif #include "rpc_parse.h" #include "rpc_util.h" diff --git a/src/rxgen/rpc_util.c b/src/rxgen/rpc_util.c index 4b7ce3a36..807ccbdfe 100644 --- a/src/rxgen/rpc_util.c +++ b/src/rxgen/rpc_util.c @@ -35,11 +35,12 @@ #include #include #include +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif #include "rpc_scan.h" #include "rpc_parse.h" diff --git a/src/ubik/udebug.c b/src/ubik/udebug.c index 4d53ed5a3..b33a36289 100644 --- a/src/ubik/udebug.c +++ b/src/ubik/udebug.c @@ -11,11 +11,12 @@ #include #include #include +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif #ifdef AFS_NT40_ENV #include diff --git a/src/update/client.c b/src/update/client.c index a90f9566f..b38fc654e 100644 --- a/src/update/client.c +++ b/src/update/client.c @@ -34,10 +34,11 @@ #endif #ifdef HAVE_STRINGS_H #include -#endif +#else #ifdef HAVE_STRING_H #include #endif +#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/update/server.c b/src/update/server.c index bf584a7fe..471c4a94e 100644 --- a/src/update/server.c +++ b/src/update/server.c @@ -27,11 +27,12 @@ #include #include #endif +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif #ifdef HAVE_UNISTD_H #include diff --git a/src/update/utils.c b/src/update/utils.c index 5573eddf8..5f7de410a 100644 --- a/src/update/utils.c +++ b/src/update/utils.c @@ -18,11 +18,12 @@ #include #endif #include +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif #ifdef HAVE_UNISTD_H #include diff --git a/src/util/volparse.c b/src/util/volparse.c index 441d88ba2..bad8961bb 100644 --- a/src/util/volparse.c +++ b/src/util/volparse.c @@ -13,11 +13,12 @@ #include #include +#ifdef HAVE_STRINGS_H +#include +#else #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_STRINGS_H -#include #endif #ifdef HAVE_STDLIB_H #include