hpux-build-updates-20051002
authorJoe Buehler <aspam@cox.net>
Mon, 3 Oct 2005 03:44:42 +0000 (03:44 +0000)
committerDerrick Brashear <shadow@dementia.org>
Mon, 3 Oct 2005 03:44:42 +0000 (03:44 +0000)
FIXES 21722

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

acinclude.m4
src/afs/VNOPS/afs_vnop_readdir.c
src/vfsck/dir.c
src/vfsck/inode.c
src/vfsck/main.c
src/vfsck/pass2.c
src/vfsck/utilities.c
src/vfsck/vprintf.c

index c2aa36b..81421d4 100644 (file)
@@ -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
@@ -861,6 +864,11 @@ 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
 AC_SUBST(PTHREAD_LIBS)
index a7a3e87..8cfcae7 100644 (file)
@@ -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
index d9e54d4..29792eb 100644 (file)
@@ -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>
index 253f302..c93e451 100644 (file)
@@ -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
index 5ce904e..ee034f2 100644 (file)
@@ -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>
index d35c5f6..59f4524 100644 (file)
@@ -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
index c9be6e0..27ea707 100644 (file)
@@ -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
index 9748cda..849451d 100644 (file)
@@ -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>