hpux-build-updates-20051002

FIXES 21722

ndir.h has been changed. also, pthreads header doesn't match how we used it

diff --git a/acinclude.m4 b/acinclude.m4
index c2aa36b242baa2fe69a752b3b7b803e5c41c7fc6..81421d415e8b54a810d5dd0be7811fe2c9641118 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -180,6 +180,9 @@ case $system in
         *-hpux*)
                MKAFS_OSTYPE=HPUX
                 AC_MSG_RESULT(hp_ux)
+               if test -f "/usr/old/usr/include/ndir.h"; then
+                AC_DEFINE(HAVE_USR_OLD_USR_INCLUDE_NDIR_H, 1, [define if you have old ndir.h])
+               fi
                 ;;
         *-irix*)
                if test -d /usr/include/sys/SN/SN1; then
@@ -860,6 +863,11 @@ fi
 if test "x$PTHREAD_LIBS" = xerror; then
         AC_CHECK_FUNC(pthread_attr_init, PTHREAD_LIBS="")
 fi
+if test "x$PTHREAD_LIBS" = xerror; then
+        # pthread_attr_init is a macro under HPUX 11.0 and 11.11
+        AC_CHECK_LIB(pthread, pthread_attr_destroy,
+                PTHREAD_LIBS="-lpthread")
+fi
 if test "x$PTHREAD_LIBS" = xerror; then
         AC_MSG_WARN(*** Unable to locate working posix thread library ***)
 fi

diff --git a/src/afs/VNOPS/afs_vnop_readdir.c b/src/afs/VNOPS/afs_vnop_readdir.c
index a7a3e87332c53f5f9b63eedd08dc3b30e8fb9055..8cfcae7ed46d3edbce4e952b4c6b3208ac42d890 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_readdir.c
+++ b/src/afs/VNOPS/afs_vnop_readdir.c
@@ -580,8 +580,9 @@ afs_readdir(OSI_VC_ARG(avc), auio, acred)
 #if defined(AFS_SGI53_ENV)
     afs_int32 use64BitDirent, dirsiz;
 #endif /* defined(AFS_SGI53_ENV) */
+#ifndef        AFS_HPUX_ENV
     OSI_VC_CONVERT(avc);
-#ifdef AFS_HPUX_ENV
+#else
     /*
      * XXX All the hacks for alloced sdirEntry and inlining of afs_readdir_move instead of calling
      * it is necessary for hpux due to stack problems that seem to occur when coming thru the nfs

diff --git a/src/vfsck/dir.c b/src/vfsck/dir.c
index d9e54d4629a1e9c8fd7bb0c81c211f3e9299665f..29792eb520e608c08e75065b37002815af68c23a 100644 (file)
--- a/src/vfsck/dir.c
+++ b/src/vfsck/dir.c
@@ -64,7 +64,11 @@ RCSID
 #include <sys/sysmacros.h>
 #include <sys/ino.h>
 #define        DIRSIZ_MACRO
+#ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H
+#include </usr/old/usr/include/ndir.h>
+#else
 #include <ndir.h>
+#endif
 #else
 #define KERNEL
 #include <sys/dir.h>

diff --git a/src/vfsck/inode.c b/src/vfsck/inode.c
index 253f3024bb2d47683744cb73df4256b300b319b2..c93e4513eb898388d5660606813bdd91d44139ce 100644 (file)
--- a/src/vfsck/inode.c
+++ b/src/vfsck/inode.c
@@ -62,7 +62,11 @@ RCSID
 #include <sys/sysmacros.h>
 #include <sys/ino.h>
 #define        DIRSIZ_MACRO
+#ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H
+#include </usr/old/usr/include/ndir.h>
+#else
 #include <ndir.h>
+#endif
 #else
 #include <sys/dir.h>
 #endif

diff --git a/src/vfsck/main.c b/src/vfsck/main.c
index 5ce904ed0d51f58891c04260a11cac84f9fc2209..ee034f2d410f46e9d5fa68f22fff258ac93c3031 100644 (file)
--- a/src/vfsck/main.c
+++ b/src/vfsck/main.c
@@ -70,7 +70,11 @@ RCSID
 #include <sys/sysmacros.h>
 #include <sys/ino.h>
 #define        DIRSIZ_MACRO
+#ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H
+#include </usr/old/usr/include/ndir.h>
+#else
 #include <ndir.h>
+#endif
 #else
 #define KERNEL
 #include <sys/dir.h>

diff --git a/src/vfsck/pass2.c b/src/vfsck/pass2.c
index d35c5f6fcdd3e68fc1e2587783172578830c29f3..59f4524f2881bbe02e4800ed2353abd4763e373a 100644 (file)
--- a/src/vfsck/pass2.c
+++ b/src/vfsck/pass2.c
@@ -60,7 +60,11 @@ RCSID
 #include <sys/sysmacros.h>
 #include <sys/ino.h>
 #define        DIRSIZ_MACRO
+#ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H
+#include </usr/old/usr/include/ndir.h>
+#else
 #include <ndir.h>
+#endif
 #else
 #include <sys/dir.h>
 #endif

diff --git a/src/vfsck/utilities.c b/src/vfsck/utilities.c
index c9be6e01a72186c3b1a8db816e805f15ef221e0b..27ea70706d9877cd7a48aa128b039a3dc4b5d18d 100644 (file)
--- a/src/vfsck/utilities.c
+++ b/src/vfsck/utilities.c
@@ -62,7 +62,11 @@ RCSID
 #include <sys/ino.h>
 #include <sys/signal.h>
 #define        DIRSIZ_MACRO
+#ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H
+#include </usr/old/usr/include/ndir.h>
+#else
 #include <ndir.h>
+#endif
 #else
 #include <sys/dir.h>
 #endif

diff --git a/src/vfsck/vprintf.c b/src/vfsck/vprintf.c
index 9748cda91323dca504576e8c08db8c95bc03bc6b..849451d26b61c7ebdebcfb745d96ec60194227ab 100644 (file)
--- a/src/vfsck/vprintf.c
+++ b/src/vfsck/vprintf.c
@@ -71,7 +71,11 @@ RCSID
 #include <sys/sysmacros.h>
 #include <sys/ino.h>
 #define        DIRSIZ_MACRO
+#ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H
+#include </usr/old/usr/include/ndir.h>
+#else
 #include <ndir.h>
+#endif
 #else
 #define KERNEL
 #include <sys/dir.h>