* include/am_defs.h: define extern for sleep(3) if needed.

* m4/macros/header_templates.m4: template for sleep(3) extern.

* configure.in: check for extern for sleep(3), which is missing
from some old (and buggy) versions of gcc's fixinc'ed headers.

* conf/nfs_prot/nfs_prot_aix4_3.h: update definition of struct
nfs_args from actual system headers.

* conf/mount/mount_aix.c (mount_aix3): fix name of aix4 "bis"
structure.

diff --git a/ChangeLog b/ChangeLog
index fe35fa118a46547df7e9090377e784bb434d60e8..f8d7d5f9b11accb9e867ff940c2058f30e2b32c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2005-06-23  Erez Zadok  <ezk@cs.sunysb.edu>
+
+       * include/am_defs.h: define extern for sleep(3) if needed.
+
+       * m4/macros/header_templates.m4: template for sleep(3) extern.
+
+       * configure.in: check for extern for sleep(3), which is missing
+       from some old (and buggy) versions of gcc's fixinc'ed headers.
+
+       * conf/nfs_prot/nfs_prot_aix4_3.h: update definition of struct
+       nfs_args from actual system headers.
+
+       * conf/mount/mount_aix.c (mount_aix3): fix name of aix4 "bis"
+       structure.
+
 2005-06-22  Erez Zadok  <ezk@cs.sunysb.edu>
 
        * BUGS: update Solaris information about use of f/lex and

diff --git a/conf/mount/mount_aix.c b/conf/mount/mount_aix.c
index 75a645e4428d34e378db1b6d654262c846a81022..1c731aaf70b5bb7e18cfbdf4a812fc4449896d48 100644 (file)
--- a/conf/mount/mount_aix.c
+++ b/conf/mount/mount_aix.c
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: mount_aix.c,v 1.13 2005/01/03 20:56:45 ezk Exp $
+ * $Id: mount_aix.c,v 1.14 2005/06/23 20:02:40 ezk Exp $
  *
  */
 
@@ -112,7 +112,7 @@ mount_aix3(char *fsname, char *dir, int flags, int type, void *data, char *mnt_o
   struct nfs_args v2args;
   nfs_args_t *v3args = (nfs_args_t *) data;
 #ifdef MOUNT_TYPE_NFS3_BIS
-  struct aix42_nfs_args_bis v3args_bis;
+  struct aix4_nfs_args_bis v3args_bis;
 #endif /* MOUNT_TYPE_NFS3_BIS */
 #endif /* HAVE_FS_NFS3 */
 

diff --git a/conf/nfs_prot/nfs_prot_aix4_3.h b/conf/nfs_prot/nfs_prot_aix4_3.h
index 7b955a99651d3a23a089273f1983fe2fce09cab4..9369ed6fd68125d6560a2d3569d2ac9d90972471 100644 (file)
--- a/conf/nfs_prot/nfs_prot_aix4_3.h
+++ b/conf/nfs_prot/nfs_prot_aix4_3.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: nfs_prot_aix4_3.h,v 1.13 2005/01/16 23:59:25 ezk Exp $
+ * $Id: nfs_prot_aix4_3.h,v 1.14 2005/06/23 20:02:40 ezk Exp $
  *
  */
 
@@ -223,6 +223,29 @@ typedef writeargs  nfswriteargs;
  */
 #ifdef MNT_NFS3
 
+struct aix4_nfs_args {
+  struct sockaddr_in addr;     /* file server address */
+  struct sockaddr_in *syncaddr;        /* secure NFS time sync addr */
+  int proto;                   /* IPPROTO_TCP/IPPROTO_UDP ??? */
+  char *hostname;              /* server's hostname */
+  char *netname;               /* server's netname */
+  caddr_t fh;                  /* File handle to be mounted */
+  int flags;                   /* flags */
+  int wsize;                   /* write size in bytes */
+  int rsize;                   /* read size in bytes */
+  int timeo;                   /* initial timeout in .1 secs */
+  int retrans;                 /* times to retry send */
+  int acregmin;                        /* attr cache file min secs */
+  int acregmax;                        /* attr cache file max secs */
+  int acdirmin;                        /* attr cache dir min secs */
+  int acdirmax;                        /* attr cache dir max secs */
+  struct ppathcnf *pathconf;   /* static pathconf kludge */
+  int biods;                   /* biods per mount */
+  int numclust;                        /* numclust per mount */
+};
+
+#if 0
+/* old structure we hand crafted. no longer needed */
 struct aix4_nfs_args {
   struct sockaddr_in addr;     /* server address and port */
   caddr_t u0;                  /* ??? UNKNOWN ??? */
@@ -242,6 +265,7 @@ struct aix4_nfs_args {
   unsigned long u14;           /* ??? UNKNOWN ??? */
   struct pathcnf *pathconf;    /* pathconf */
 };
+#endif
 
 /*
  * IBM is in dire need of taking a soft-eng class.

diff --git a/configure.in b/configure.in
index cddf26e152101d647b6d107a8d306f628e611942..76733969ee879bcf58850af799bcf937ddefbae6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -59,7 +59,7 @@ AH_BOTTOM([
 dnl
 dnl AC_CONFIG_AUX_DIR(m4)
 AC_PREREQ(2.52)
-AC_REVISION($Revision: 1.97 $)
+AC_REVISION($Revision: 1.98 $)
 AC_COPYRIGHT([Copyright (c) 1997-2005 Erez Zadok])
 dnl find out system type
 AC_MSG_NOTICE(*** SYSTEM TYPES ***)
@@ -769,6 +769,7 @@ AMU_CHECK_EXTERNS(
        sbrk                    \
        seteuid                 \
        setitimer               \
+       sleep                   \
        strcasecmp              \
        strdup                  \
        strlcpy                 \

diff --git a/include/am_defs.h b/include/am_defs.h
index 0e7c6cd2eea5b55cbd57a1277de135d488020f88..53dbe2760a3676c662777c15bcd53b82bd2aad16 100644 (file)
--- a/include/am_defs.h
+++ b/include/am_defs.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: am_defs.h,v 1.58 2005/05/28 16:44:42 ezk Exp $
+ * $Id: am_defs.h,v 1.59 2005/06/23 20:02:40 ezk Exp $
  *
  */
 
@@ -1491,6 +1491,10 @@ extern int seteuid(uid_t euid);
 extern int setitimer(int, struct itimerval *, struct itimerval *);
 #endif /* defined(HAVE_SETITIMER) && !defined(HAVE_EXTERN_SETITIMER) */
 
+#ifndef HAVE_EXTERN_SLEEP
+extern unsigned int sleep(unsign int seconds);
+#endif /* not HAVE_EXTERN_SETITIMER */
+
 #ifndef HAVE_EXTERN_STRCASECMP
 /*
  * define this extern even if function does not exist, for it will

diff --git a/m4/macros/header_templates.m4 b/m4/macros/header_templates.m4
index 135d2655c57ca5501698920f49b370516665802b..9a7698cafda89f6308446bf1d35ee0bccfa7ecf7 100644 (file)
--- a/m4/macros/header_templates.m4
+++ b/m4/macros/header_templates.m4
@@ -910,6 +910,9 @@ AH_TEMPLATE([HAVE_EXTERN_SETEUID],
 AH_TEMPLATE([HAVE_EXTERN_SETITIMER],
 [does extern definition for setitimer() exist?])
 
+AH_TEMPLATE([HAVE_EXTERN_SLEEP],
+[does extern definition for sleep() exist?])
+
 AH_TEMPLATE([HAVE_EXTERN_STRCASECMP],
 [does extern definition for strcasecmp() exist?])