Updated build patch for hpux 10.20 and ultrix 4.3

[John David Anglin]

Here is an updated patch that allows building 5.0.1 under ultrix 4.3.

The changes needed to stat.c appear fragile.  Probably, a better
approach would be a configure test to determine which headers need
to be included.

I am seeing problems running the testsuite.  Files are not being found
in a number of the tests.

Dave
-- 
J. David Anglin                                  address@hidden
National Research Council of Canada              (613) 990-0752 (FAX: 952-6602)

2003-06-09  John David Anglin  <address@hidden>

        * lib/acl.c: Include sys/types.h.
        * src/readlink.c: Likewise.
        * src/extract-magic: Remove '<' argument from open statement.
        * src/stat.c: Include sys/statvfs.h in preference to sys/vfs.h.
        Include sys/param.h and sys/mount.h on ultrix.

--- lib/acl.c.orig      Fri Jun  6 12:25:32 2003
+++ lib/acl.c   Sat Jun  7 12:32:52 2003
@@ -22,6 +22,7 @@
 # include <config.h>
 #endif
 
+#include <sys/types.h>
 #include <sys/stat.h>
 #ifndef S_ISLNK
 # define S_ISLNK(Mode) 0
--- src/extract-magic.orig      Fri Jun  6 12:25:47 2003
+++ src/extract-magic   Sun Jun  8 11:41:43 2003
@@ -77,7 +77,7 @@ EOF
 
   my $file = $ARGV[0];
 
-  open FH, '<', $file
+  open FH, $file
     or die "$ME: can't open `$file' for reading: $!\n";
 
   # For each line like this:
--- src/readlink.c.orig Fri Jun  6 12:25:47 2003
+++ src/readlink.c      Sat Jun  7 18:56:47 2003
@@ -23,6 +23,7 @@
 #include <unistd.h>
 #include <limits.h>
 #include <getopt.h>
+#include <sys/types.h>
 
 #include "system.h"
 #include "canonicalize.h"
--- src/stat.c.orig     Fri Jun  6 12:25:47 2003
+++ src/stat.c  Sun Jun  8 12:13:37 2003
@@ -25,10 +25,10 @@
 #include <grp.h>
 #include <unistd.h>
 #include <time.h>
-#if HAVE_SYS_VFS_H
-# include <sys/vfs.h>
-#elif HAVE_SYS_STATVFS_H && HAVE_STRUCT_STATVFS_F_BASETYPE
+#if HAVE_SYS_STATVFS_H && HAVE_STRUCT_STATVFS_F_BASETYPE
 # include <sys/statvfs.h>
+#elif HAVE_SYS_VFS_H
+# include <sys/vfs.h>
 #elif HAVE_SYS_MOUNT_H && HAVE_SYS_PARAM_H
 /* NOTE: freebsd5.0 needs sys/param.h and sys/mount.h for statfs.
    It does have statvfs.h, but shouldn't use it, since it doesn't
@@ -36,11 +36,12 @@
 /* NetBSD 1.5.2 needs these, for the declaration of struct statfs. */
 # include <sys/param.h>
 # include <sys/mount.h>
-#elif HAVE_NETINET_IN_H && HAVE_NFS_NFS_CLNT_H && HAVE_NFS_VFS_H
+# if HAVE_NETINET_IN_H && HAVE_NFS_NFS_CLNT_H && HAVE_NFS_VFS_H
 /* Ultrix 4.4 needs these for the declaration of struct statfs.  */
-# include <netinet/in.h>
-# include <nfs/nfs_clnt.h>
-# include <nfs/vfs.h>
+#  include <netinet/in.h>
+#  include <nfs/nfs_clnt.h>
+#  include <nfs/vfs.h>
+# endif
 #endif
 
 #include "system.h"