From: Douglas Engert Date: Mon, 10 Mar 2003 20:02:35 +0000 (+0000) Subject: hpux11i-20030310 X-Git-Tag: openafs-devel-1_3_50~325 X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=47df7e9f3ac680b2c672c34277bf34ffe6ef8737 hpux11i-20030310 Support for HPUX110 --- diff --git a/Makefile.in b/Makefile.in index 0941519..7242981 100644 --- a/Makefile.in +++ b/Makefile.in @@ -356,7 +356,7 @@ libuafs: libuafs_setup vlserver_depinstall rx_depinstall fsint_depinstall \ rxstat_depinstall lwp_depinstall des set -x; \ case ${SYS_NAME} in \ - hp_ux102* | *_obsd* | sun*_4* | *_nbsd*| ia64_hpux1122) \ + hp_ux102* | *_obsd* | sun*_4* | *_nbsd*| hp_ux11i | ia64_hpux1122) \ echo Skipping libuafs for ${SYS_NAME} ;; \ * ) \ ${COMPILE_PART1} libuafs ${COMPILE_PART2} ;; \ @@ -464,7 +464,7 @@ libadmin: libafsauthent bozo libjafs: libadmin case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux11*) \ + alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux110) \ ${COMPILE_PART1} JAVA/libjafs ${COMPILE_PART2} ;; \ *) \ echo Not building MT libjafs for ${SYS_NAME} ;; \ diff --git a/acinclude.m4 b/acinclude.m4 index c84ccf9..5eaac5f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -375,9 +375,12 @@ else AFS_PARAM_COMMON=param.nbsd16.h AFS_SYSNAME="alpha_nbsd16" ;; - hppa*-hp-hpux11*) + hppa*-hp-hpux11.0*) AFS_SYSNAME="hp_ux110" ;; + hppa*-hp-hpux11.11) + AFS_SYSNAME="hp_ux11i" + ;; ia64-hp-hpux*) AFS_SYSNAME="ia64_hpux1122" ;; diff --git a/src/afs/HPUX/osi_groups.c b/src/afs/HPUX/osi_groups.c index a17ef35..7623218 100644 --- a/src/afs/HPUX/osi_groups.c +++ b/src/afs/HPUX/osi_groups.c @@ -133,7 +133,7 @@ afs_setgroups( int *gp; struct ucred *newcr; ulong_t s; -#if defined(AFS_HPUX1122_ENV) +#if defined(AFS_HPUX110_ENV) register ulong_t context; #endif @@ -150,7 +150,7 @@ afs_setgroups( /* somebody else might have a pointer to this structure. ** make sure we do not have a race condition */ newcr = *cred; -#if defined(AFS_HPUX1122_ENV) +#if defined(AFS_HPUX110_ENV) /* all of the uniprocessor spinlocks are not defined. */ /* I assume the UP and MP are now handled together */ MP_SPINLOCK_USAV(cred_lock, context); @@ -178,7 +178,7 @@ afs_setgroups( } else { -#if defined(AFS_HPUX1122_ENV) +#if defined(AFS_HPUX110_ENV) MP_SPINUNLOCK_USAV(cred_lock, context); #else (void) UP_SPLX(s); diff --git a/src/afs/HPUX/osi_machdep.h b/src/afs/HPUX/osi_machdep.h index ce823ca..1035bad 100644 --- a/src/afs/HPUX/osi_machdep.h +++ b/src/afs/HPUX/osi_machdep.h @@ -51,7 +51,7 @@ extern struct timeval time; * HP uses global mutex to protect afs land */ -#if !defined(AFS_HPUX1122_ENV) +#if !defined(AFS_HPUX110_ENV) extern sema_t afs_global_sema; #else extern b_sema_t afs_global_sema; @@ -59,7 +59,7 @@ extern b_sema_t afs_global_sema; extern void osi_InitGlock(void); -#if !defined(AFS_HPUX1122_ENV) +#if !defined(AFS_HPUX110_ENV) extern void afsHash(int nbuckets); extern sv_sema_t *afsHashInsertFind(tid_t key); extern sv_sema_t *afsHashFind(tid_t key); @@ -90,7 +90,7 @@ extern void afsHashRelease(tid_t key); #define USERPRI NET_SPLX(splvar) #endif /* KERNEL */ -#if !defined(AFS_HPUX1122_ENV) +#if !defined(AFS_HPUX110_ENV) /* * On HP, the global lock is an alpha semaphore, hence it is automatically * released and reacquired aroubd a sleep() and wakeup(). @@ -110,19 +110,14 @@ int afs_osi_Wakeup(void *event); #define osi_NullHandle(x) ((x)->proc == (caddr_t) 0) -#if !defined(AFS_HPUX1122_ENV) +#if !defined(AFS_HPUX110_ENV) extern caddr_t kmem_alloc(); -#else -#undef kmem_alloc -#undef kmem_free -#define kmem_alloc(a) kmalloc(a, M_IHV, M_WAITOK) -#define kmem_free(a,b) kfree(a, M_IHV) #endif #include /* for kt_cred() */ /* Expected to be available as a patch from HP */ /* See section D of the top level README for details */ -#if defined(AFS_HPUX1122_ENV) +#if defined(AFS_HPUX110_ENV) #include #else #include diff --git a/src/afs/HPUX/osi_sleep.c b/src/afs/HPUX/osi_sleep.c index 5818e99..fa36325 100644 --- a/src/afs/HPUX/osi_sleep.c +++ b/src/afs/HPUX/osi_sleep.c @@ -16,8 +16,9 @@ RCSID("$Header$"); #include "afsincludes.h" /* Afs-based standard headers */ #include "afs/afs_stats.h" /* afs statistics */ - +#if !defined(AFS_HPUX110_ENV) static char waitV; +#endif /* call procedure aproc with arock as an argument, in ams milliseconds */ static int afs_osi_CallProc(aproc, arock, ams) @@ -28,12 +29,12 @@ static int afs_osi_CallProc(aproc, arock, ams) int code; AFS_STATCNT(osi_CallProc); -#if !defined(AFS_HPUX1122_ENV) +#if !defined(AFS_HPUX110_ENV) AFS_GUNLOCK(); #endif /* hz is in cycles/second, and timeout's 3rd parm is in cycles */ code = timeout(aproc, arock, (ams * afs_hz)/1000 + 1); -#if !defined(AFS_HPUX1122_ENV) +#if !defined(AFS_HPUX110_ENV) AFS_GLOCK(); #endif return code; @@ -47,17 +48,17 @@ static int afs_osi_CancelProc(aproc, arock) int code = 0; AFS_STATCNT(osi_CancelProc); -#if !defined(AFS_HPUX1122_ENV) +#if !defined(AFS_HPUX110_ENV) AFS_GUNLOCK(); #endif code = untimeout(aproc, arock); -#if !defined(AFS_HPUX1122_ENV) +#if !defined(AFS_HPUX110_ENV) AFS_GLOCK(); #endif return code; } -#if defined(AFS_HPUX1122_ENV) +#if defined(AFS_HPUX110_ENV) static void AfsWaitHack(char * event) { lock_t * sleep_lock; @@ -91,7 +92,7 @@ void afs_osi_CancelWait(struct afs_osi_WaitHandle *achandle) proc = achandle->proc; if (proc == 0) return; achandle->proc = (caddr_t) 0; /* so dude can figure out he was signalled */ -#if defined(AFS_HPUX1122_ENV) +#if defined(AFS_HPUX110_ENV) afs_osi_Wakeup((char *)achandle); #else afs_osi_Wakeup(&waitV); @@ -107,7 +108,7 @@ int afs_osi_Wait(afs_int32 ams, struct afs_osi_WaitHandle *ahandle, int aintok) { int code; afs_int32 endTime, tid; -#if defined(AFS_HPUX1122_ENV) +#if defined(AFS_HPUX110_ENV) char localwait; char * event; #endif @@ -120,7 +121,7 @@ int afs_osi_Wait(afs_int32 ams, struct afs_osi_WaitHandle *ahandle, int aintok) AFS_ASSERT_GLOCK(); code = 0; /* do not do anything for solaris, digital, AIX, and SGI MP */ -#if defined(AFS_HPUX1122_ENV) +#if defined(AFS_HPUX110_ENV) if (ahandle) { event = (char *) ahandle; } @@ -153,7 +154,7 @@ int afs_osi_SleepSig(void *event) return 0; } -#if defined(AFS_HPUX1122_ENV) +#if defined(AFS_HPUX110_ENV) void afs_osi_Sleep(void *event) { lock_t * sleep_lock; diff --git a/src/afs/HPUX/osi_vfsops.c b/src/afs/HPUX/osi_vfsops.c index 5c1f713..99ddfea 100644 --- a/src/afs/HPUX/osi_vfsops.c +++ b/src/afs/HPUX/osi_vfsops.c @@ -186,7 +186,7 @@ struct vfsops Afs_vfsops = { static int afs_Starting = 0; #pragma align 64 -#if !defined(AFS_HPUX1122_ENV) +#if !defined(AFS_HPUX110_ENV) sema_t afs_global_sema = { NULL, 0, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, /* sa_type */ 0, 0, 0, 0, 0, 0, 0, NULL, /* sa_link */ @@ -208,7 +208,7 @@ osi_InitGlock() if ( !afs_Starting ) { afs_Starting = 1; SPINUNLOCK_USAV(sched_lock, context); -#if defined(AFS_HPUX1122_ENV) +#if defined(AFS_HPUX110_ENV) b_initsema(&afs_global_sema, 1, NFS_LOCK_ORDER2, "AFS GLOCK"); /* afsHash(64); */ /* 64 buckets */ #else diff --git a/src/afs/HPUX/osi_vnodeops.c b/src/afs/HPUX/osi_vnodeops.c index ebeac82..6a9580a 100644 --- a/src/afs/HPUX/osi_vnodeops.c +++ b/src/afs/HPUX/osi_vnodeops.c @@ -49,18 +49,19 @@ extern int afs_close(); #define vtoblksz(vp) ((vp)->v_vfsp->vfs_bsize) -#if defined(AFS_HPUX1122_ENV) +#if defined(AFS_HPUX110_ENV) /* We no longer need to lock on the VM Empire, * or at least that is what is claimed. * so we will noopt the vmemp_ routines * This needs to be looked at closer. */ #define vmemp_lockx() +#undef vmemp_returnx #define vmemp_returnx(a) return(a) #define vmemp_unlockx() #endif -#if !defined(AFS_HPUX1122_ENV) +#if !defined(AFS_HPUX110_ENV) /* * Copy an mbuf to the contiguous area pointed to by cp. * Skip bytes and copy bytes. @@ -1278,7 +1279,7 @@ retry: if (change_to_fstore) afspgin_update_dbd(vm_info, bsize); -#if defined(AFS_HPUX1122_ENV) +#if defined(AFS_HPUX110_ENV) getppdp()->cnt.v_exfod += count; #else mpproc_info[getprocindex()].cnt.v_exfod += count; @@ -1650,7 +1651,7 @@ afs_pageout(vp,prp, start, end, flags) */ if (steal) { if (flags & PF_DEACT) { -#if defined(AFS_HPUX1122_ENV) +#if defined(AFS_HPUX110_ENV) getppdp()->cnt.v_pswpout += npages; #else mpproc_info[getprocindex()].cnt.v_pswpout += npages; @@ -1658,7 +1659,7 @@ afs_pageout(vp,prp, start, end, flags) /* sar_bswapout += ptod(npages);*/ } else if (vhand) { -#if defined(AFS_HPUX1122_ENV) +#if defined(AFS_HPUX110_ENV) getppdp()->cnt.v_pgout++; getppdp()->cnt.v_pgpgout += npages; #else @@ -1918,7 +1919,7 @@ afs_swapfs_len(bp) afs_mmap(vp, off, size_bytes, access) struct vnode *vp; u_int off; -#if defined(AFS_HPUX1122_ENV) +#if defined(AFS_HPUX1111_ENV) u_long size_bytes; #else u_int size_bytes; @@ -1956,7 +1957,7 @@ int afs_unmap(vp,off, size_bytes,access) struct vnode *vp; u_int off; -#if defined(AFS_HPUX1122_ENV) +#if defined(AFS_HPUX1111_ENV) u_long size_bytes; #else u_int size_bytes; @@ -2022,7 +2023,7 @@ afs_ioctl(vp, com, data, flag, cred) return(ENOTTY); } -#if defined(AFS_HPUX1122_ENV) +#if defined(AFS_HPUX1111_ENV) /* looks like even if appl is 32 bit, we need to round to 8 bytes */ /* This had no effect, it must not be being used */ diff --git a/src/afs/VNOPS/afs_vnop_attrs.c b/src/afs/VNOPS/afs_vnop_attrs.c index dd8543c..f19b7fd 100644 --- a/src/afs/VNOPS/afs_vnop_attrs.c +++ b/src/afs/VNOPS/afs_vnop_attrs.c @@ -33,7 +33,7 @@ RCSID("$Header$"); extern afs_rwlock_t afs_xcbhash; struct afs_exporter *afs_nfsexporter; extern struct vcache *afs_globalVp; -#if defined(AFS_HPUX1122_ENV) +#if defined(AFS_HPUX110_ENV) extern struct vfs *afs_globalVFS; #endif @@ -139,7 +139,7 @@ int afs_CopyOutAttrs(register struct vcache *avc, register struct vattr *attrs) #else attrs->va_rdev = 1; #endif -#if defined(AFS_HPUX1122_ENV) +#if defined(AFS_HPUX110_ENV) if (afs_globalVFS) attrs->va_fstype = afs_globalVFS->vfs_mtype; #endif diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h index e1e8339..ac712c0 100644 --- a/src/afs/sysincludes.h +++ b/src/afs/sysincludes.h @@ -230,7 +230,7 @@ typedef unsigned short etap_event_t; struct vfspage; /* for vnode.h compiler warnings */ # include "h/swap.h" /* for struct swpdbd, for vnode.h compiler warnings */ # include "h/dbd.h" /* for union idbd, for vnode.h compiler warnings */ -#ifdef AFS_HPUX1122_ENV +#ifdef AFS_HPUX110_ENV # include "h/resource.h" #endif # endif /* AFS_HPUX_ENV */ diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4 index d29b84b..010f2fa 100644 --- a/src/cf/osconf.m4 +++ b/src/cf/osconf.m4 @@ -119,7 +119,7 @@ case $AFS_SYSNAME in SHLIB_LINKER="ld -b" ;; - hp_ux110) + hp_ux11*) AR="/usr/bin/ar" AS="/usr/ccs/bin/as" CC="/opt/ansic/bin/cc" diff --git a/src/config/param.hp_ux11i.h b/src/config/param.hp_ux11i.h new file mode 100644 index 0000000..6f4090d --- /dev/null +++ b/src/config/param.hp_ux11i.h @@ -0,0 +1,172 @@ +#ifndef UKERNEL +/* This section for kernel libafs compiles only */ + +/* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + +/* THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT */ + +#ifndef AFS_PARAM_H +#define AFS_PARAM_H + +#define AFS_HPUX_ENV 1 +#define AFS_HPUX90_ENV 1 +#define AFS_HPUX100_ENV 1 +#define AFS_HPUX101_ENV 1 +#define AFS_HPUX102_ENV 1 +#define AFS_HPUX110_ENV 1 +#define AFS_HPUX1111_ENV 1 + +#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ +#define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ + +#include + +#define AFS_SYSCALL 48 /* slot reserved for AFS */ + +/* Machine / Operating system information */ +#define SYS_NAME "hp_ux11i" +#define SYS_NAME_ID SYS_NAME_ID_hp_ux11i +#define AFSBIG_ENDIAN 1 +#define AFS_HAVE_FFS 1 +#define AFS_HAVE_STATVFS 1 /* System supports statvfs */ +#define AFS_GLOBAL_SUNLOCK 1 +#define RXK_LISTENER_ENV 1 +#define AFS_USERSPACE_IP_ADDR 1 +#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ +/* + * #define AFS_VM_RDWR_ENV 1 + */ +#define AFS_TEXT_ENV 1 /* Older kernels use TEXT */ +#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ +#define NEARINODE_HINT 1 /* hint to ufs module to scatter inodes on disk*/ +#define nearInodeHash(volid, hval) { \ + unsigned char* ts = (unsigned char*)&(volid)+sizeof(volid)-1;\ + for ( (hval)=0; ts >= (unsigned char*)&(volid); ts--){\ + (hval) *= 173; \ + (hval) += *ts; \ + } \ + } + +#define KERNEL_HAVE_UERROR 1 + +/* Extra kernel definitions (from kdefs file) */ +#ifdef KERNEL +#define _KERNEL 1 +#define afsio_iov uio_iov +#define afsio_iovcnt uio_iovcnt +#define afsio_offset uio_offset +#define afsio_seg uio_seg +#define afsio_resid uio_resid +#define AFS_UIOSYS UIOSEG_KERNEL +#define AFS_UIOUSER UIOSEG_USER +#define AFS_CLBYTES CLBYTES +#define AFS_MINCHANGE 2 +#define osi_GetTime(x) do { struct timeval osi_GetTimeVar; uniqtime(&osi_GetTimeVar); (x)->tv_sec = osi_GetTimeVar.tv_sec; (x)->tv_usec = osi_GetTimeVar.tv_usec; } while(0) +#define AFS_KALLOC kmem_alloc +#define AFS_KFREE kmem_free +#define VATTR_NULL vattr_null + +#if defined(__LP64__) +#define AFS_HPUX_64BIT_ENV 1 +#endif + +#ifndef UKERNEL +/* + * On HP-UX, sys/socket.h includes sys/uio.h, and sys/file.h and + * sys/uio.h #include each other, and there's no simple way to avoid a + * warning about the struct uio declaration not being visible outside + * of some prototype or other. So, we put in a tenative declaration to + * supress the warnings. + */ +struct uio; + +#define memset(A, B, S) bzero(A, S) +#define memcpy(B, A, S) bcopy(A, B, S) +#define memcmp(A, B, S) bcmp(A, B, S) +#endif +#endif /* KERNEL */ +#define AFS_DIRENT +/* Non-standard definitions */ +#ifndef EDQUOT +#define EDQUOT 69 /* Disc quota exceeded */ +#endif + +#endif /* AFS_PARAM_H */ + +#else /* !defined(UKERNEL) */ + +/* This section for user space compiles only */ + +/* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + +#ifndef AFS_PARAM_H +#define AFS_PARAM_H + +#define AFS_VFS_ENV 1 +/* Used only in vfsck code; is it needed any more???? */ +#define RXK_LISTENER_ENV 1 +#define AFS_USERSPACE_IP_ADDR 1 +#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ + +#define UKERNEL 1 /* user space kernel */ +#define AFS_GREEDY43_ENV 1 /* Used only in rx/rx_user.c */ +#define AFS_ENV 1 +#define AFS_USR_HPUX_ENV 1 + +#include + +/*#define AFS_GLOBAL_SUNLOCK 1*/ /* For global locking */ + +#define AFS_3DISPARES 1 /* Utilize the 3 available disk inode 'spares' */ + +#define AFS_SYSCALL 48 /* slot reserved for AFS */ + +/* File system entry (used if mount.h doesn't define MOUNT_AFS */ +#define AFS_MOUNT_AFS 1 + +/* Machine / Operating system information */ +#define SYS_NAME "hp_ux110" +#define SYS_NAME_ID SYS_NAME_ID_hp_ux110 +#define AFSBIG_ENDIAN 1 +#define AFS_HAVE_FFS 1 /* Use system's ffs. */ +#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ + +/* Extra kernel definitions (from kdefs file) */ +#ifdef KERNEL +#define AFS_UIOFMODE 1 /* Only in afs/afs_vnodeops.c (afs_ustrategy) */ +#define AFS_SYSVLOCK 1 /* sys v locking supported */ +/*#define AFS_USEBUFFERS 1*/ +#define afsio_iov uio_iov +#define afsio_iovcnt uio_iovcnt +#define afsio_offset uio_offset +#define afsio_seg uio_segflg +#define afsio_fmode uio_fmode +#define afsio_resid uio_resid +#define AFS_UIOSYS 1 +#define AFS_UIOUSER UIO_USERSPACE +#define AFS_CLBYTES CLBYTES +#define AFS_MINCHANGE 2 +#define VATTR_NULL usr_vattr_null +#endif /* KERNEL */ +#define AFS_DIRENT +#ifndef CMSERVERPREF +#define CMSERVERPREF +#endif + +#endif /* AFS_PARAM_H */ + +#endif /* !defined(UKERNEL) */ diff --git a/src/dir/dir.c b/src/dir/dir.c index d275477..02722ad 100644 --- a/src/dir/dir.c +++ b/src/dir/dir.c @@ -73,7 +73,7 @@ RCSID("$Header$"); #endif /* AFS_MACH_ENV */ #endif #endif -#if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_HPUX1122_ENV) +#if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_HPUX110_ENV) #include "h/mbuf.h" #endif #ifndef AFS_LINUX20_ENV diff --git a/src/libafs/MakefileProto.HPUX.in b/src/libafs/MakefileProto.HPUX.in index 24d243b..cc591f1 100644 --- a/src/libafs/MakefileProto.HPUX.in +++ b/src/libafs/MakefileProto.HPUX.in @@ -48,7 +48,7 @@ AFS_OS_NONFSOBJS = \ # seems to hang). When the compiler sees the +ES1.Xindirect_calls # option, however, it issues a warning and turns off +Z. # - + KDEFS= +ES1.Xindirect_calls +XixdU +Hx0 +ESlit +ESsfc +ESssf -Wp,-H300000 -D_KERNEL -D_KERNEL_BUILD -D_UNSUPPORTED \ -DMP +R500 -Wl,+k $(CPU_KDEFS) KDEFS_32 = +DA1.0 +DS1.0 @@ -83,7 +83,7 @@ DESTDIRS = hpux_destdirs include Makefile.common - + BITS = 64 32 BITS = 64 @@ -91,9 +91,9 @@ BITS = 64 setup: -$(RM) -f h conf net dux machine netinet nfs rpc s200 ufs sys - + ln -fs /usr/include/sys h - + ln -fs /etc/conf/h h ln -fs /etc/conf conf @@ -104,7 +104,7 @@ setup: ln -fs /etc/conf/nfs nfs ln -fs /usr/include/rpc rpc ln -fs /etc/conf/machine s200 - + ln -fs /etc/conf/ufs ufs ln -fs /etc/conf/sys ufs diff --git a/src/libuafs/MakefileProto.HPUX.in b/src/libuafs/MakefileProto.HPUX.in index 26028de..3c87487 100644 --- a/src/libuafs/MakefileProto.HPUX.in +++ b/src/libuafs/MakefileProto.HPUX.in @@ -11,7 +11,7 @@ include @TOP_OBJDIR@/src/config/Makefile.config # System specific build commands and flags CC = /opt/ansic/bin/cc DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL - + KOPTS=-Wp,-H200000 -Wl,-a,archive +DA1.0 +z KOPTS=-Wp,-H200000 -Wl,-a,archive_shared @@ -20,7 +20,7 @@ CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${D OPTF=-O WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD - + TEST_CFLAGS= -Wp,-H200000 +DA1.0 +z -D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV -Dhpux -DAFS_HPUX_ENV TEST_CFLAGS= -Wp,-H200000 -D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV -Dhpux -DAFS_HPUX_ENV diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in index 470d99b..7e14356 100644 --- a/src/lwp/Makefile.in +++ b/src/lwp/Makefile.in @@ -8,7 +8,7 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CFLAGS=${LWP_DBG} ${LWP_OPTMZ} ${COMMON_INCL} +CFLAGS=${LWP_DBG} ${LWP_OPTMZ} ${XCFLAGS} ${COMMON_INCL} LIBOBJS=lwp.o process.o lock.o iomgr.o timer.o fasttime.o preempt.o \ waitkey.o threadname.o AFS_component_version_number.o diff --git a/src/rx/HPUX/rx_kmutex.h b/src/rx/HPUX/rx_kmutex.h index 459d82d..7b96e38 100644 --- a/src/rx/HPUX/rx_kmutex.h +++ b/src/rx/HPUX/rx_kmutex.h @@ -112,7 +112,7 @@ extern void osirx_AssertMine(afs_kmutex_t *lockaddr, char *msg); #define MUTEX_TRYENTER(a) b_cpsema(a) -#ifdef AFS_HPUX1122_ENV +#ifdef AFS_HPUX1111_ENV #define MUTEX_ENTER(a) \ ((b_owns_sema(a)) ? osi_Panic("Already Held") : b_psema(a)) #define MUTEX_EXIT(a) \ diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h index 35081c3..50ab143 100644 --- a/src/rx/rx_kcommon.h +++ b/src/rx/rx_kcommon.h @@ -45,7 +45,7 @@ typedef unsigned short etap_event_t; #include "h/dir.h" #endif #include "h/buf.h" -#if !defined(AFS_HPUX1122_ENV) +#if !defined(AFS_HPUX110_ENV) #include "h/mbuf.h" #endif #else /* !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV) */ diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c index 1ee18d0..fe58e65 100644 --- a/src/rx/rx_packet.c +++ b/src/rx/rx_packet.c @@ -36,7 +36,7 @@ RCSID("$Header$"); #include "h/proc.h" #endif #include "h/socket.h" -#if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_HPUX1122_ENV) +#if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_HPUX110_ENV) #if !defined(AFS_OSF_ENV) && !defined(AFS_AIX41_ENV) #include "sys/mount.h" /* it gets pulled in by something later anyway */ #endif @@ -939,7 +939,7 @@ int osi_NetSend(osi_socket socket, void *addr, struct iovec *dvec, int nvecs, * message receipt is done in rxk_input or rx_put. */ -#if defined(AFS_SUN5_ENV) || defined(AFS_HPUX1122_ENV) +#if defined(AFS_SUN5_ENV) || defined(AFS_HPUX110_ENV) /* * Copy an mblock to the contiguous area pointed to by cp. * MTUXXX Supposed to skip bytes and copy bytes, @@ -1052,7 +1052,7 @@ return len; #if !defined(AFS_LINUX20_ENV) int rx_mb_to_packet(amb, free, hdr_len, data_len, phandle) -#if defined(AFS_SUN5_ENV) || defined(AFS_HPUX1122_ENV) +#if defined(AFS_SUN5_ENV) || defined(AFS_HPUX110_ENV) mblk_t *amb; #else struct mbuf *amb; diff --git a/src/viced/callback.c b/src/viced/callback.c index f152e0c..f3c3af9 100644 --- a/src/viced/callback.c +++ b/src/viced/callback.c @@ -1395,7 +1395,7 @@ int BreakLaterCallBacks(void) /* leave hold for MultiBreakVolumeCallBack to clear */ } myfe = fe; - (struct object *)fe = ((struct object *)fe)->next; + fe = (struct FileEntry *)((struct object *)fe)->next; FreeFE(myfe); }