we haven't had a 10.2 machine to build on in quite a while...
might as well pull it, it probably doesn't work anymore
Change-Id: Iad809e83dadb0e7fa8c61b3f37f574a571042fc8
Reviewed-on: http://gerrit.openafs.org/1335
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
hppa*-hp-hpux10*)
AFS_SYSNAME="hp_ux102"
;;
- powerpc-apple-darwin1.2*)
- AFS_SYSNAME="ppc_darwin_12"
- ;;
- powerpc-apple-darwin1.3*)
- AFS_SYSNAME="ppc_darwin_13"
- ;;
- powerpc-apple-darwin1.4*)
- AFS_SYSNAME="ppc_darwin_14"
- ;;
- powerpc-apple-darwin5.1*)
- AFS_SYSNAME="ppc_darwin_14"
- ;;
- powerpc-apple-darwin5.2*)
- AFS_SYSNAME="ppc_darwin_14"
- ;;
- powerpc-apple-darwin5.3*)
- AFS_SYSNAME="ppc_darwin_14"
- ;;
- powerpc-apple-darwin5.4*)
- AFS_SYSNAME="ppc_darwin_14"
- ;;
- powerpc-apple-darwin5.5*)
- AFS_SYSNAME="ppc_darwin_14"
- ;;
- powerpc-apple-darwin6.0*)
- AFS_SYSNAME="ppc_darwin_60"
- ;;
- powerpc-apple-darwin6.1*)
- AFS_SYSNAME="ppc_darwin_60"
- ;;
- powerpc-apple-darwin6.2*)
- AFS_SYSNAME="ppc_darwin_60"
- ;;
- powerpc-apple-darwin6.3*)
- AFS_SYSNAME="ppc_darwin_60"
- ;;
- powerpc-apple-darwin6.4*)
- AFS_SYSNAME="ppc_darwin_60"
- ;;
- powerpc-apple-darwin6.5*)
- AFS_SYSNAME="ppc_darwin_60"
- ;;
- powerpc-apple-darwin7.0*)
- AFS_SYSNAME="ppc_darwin_70"
- ;;
- powerpc-apple-darwin7.1*)
- AFS_SYSNAME="ppc_darwin_70"
- ;;
- powerpc-apple-darwin7.2*)
- AFS_SYSNAME="ppc_darwin_70"
- ;;
- powerpc-apple-darwin7.3*)
+ powerpc-apple-darwin7*)
AFS_SYSNAME="ppc_darwin_70"
;;
- powerpc-apple-darwin7.4*)
- AFS_SYSNAME="ppc_darwin_70"
- ;;
- powerpc-apple-darwin7.5*)
- AFS_SYSNAME="ppc_darwin_70"
- ;;
- powerpc-apple-darwin8.0*)
- AFS_SYSNAME="ppc_darwin_80"
- ;;
powerpc-apple-darwin8.*)
AFS_SYSNAME="ppc_darwin_80"
;;
/*
* Time related macros
*/
-#ifndef AFS_DARWIN60_ENV
-extern struct timeval time;
-#endif
#ifdef AFS_DARWIN80_ENV
static inline time_t osi_Time(void) {
struct timeval _now;
extern ioctl_fcn_t afs_cdev_ioctl;
static void *afs_cdev_devfs_handle;
#else
-#ifdef AFS_DARWIN60_ENV /* not in Kernel.framework anymore !?! */
#include <sys/syscall.h>
-#else
-#include "sys/syscall.h"
-#endif
struct vfsconf afs_vfsconf;
#endif
#include <mach/kmod.h>
#else
AFS_ASSERT_GLOCK();
AFS_GUNLOCK();
-#ifdef AFS_DARWIN14_ENV
/* this is probably safe for all versions, but testing is hard */
sleep(event, PVFS);
-#else
- assert_wait((event_t) event, 0);
- thread_block(0);
-#endif
AFS_GLOCK();
#endif
}
evp->owner = current_thread();
#else
ticks = (ams * afs_hz) / 1000;
-#ifdef AFS_DARWIN14_ENV
/* this is probably safe for all versions, but testing is hard. */
/* using tsleep instead of assert_wait/thread_set_timer/thread_block
* allows shutdown to work in 1.4 */
else
prio = PVFS;
code = tsleep(event, prio, "afs_osi_TimedSleep", ticks);
-#else
- assert_wait((event_t) event, aintok ? THREAD_ABORTSAFE : THREAD_UNINT);
- thread_set_timer(ticks, NSEC_PER_SEC / hz);
- thread_block(0);
- code = 0;
-#endif
AFS_GLOCK();
#endif
if (seq == evp->seq)
evp = afs_getevent(event);
if (evp->refcount > 1) {
evp->seq++;
-#ifdef AFS_DARWIN14_ENV
/* this is probably safe for all versions, but testing is hard. */
wakeup(event);
-#else
- thread_wakeup((event_t) event);
-#endif
ret = 0;
}
relevent(evp);
#include <sys/malloc.h>
#include <sys/namei.h>
#include <sys/ubc.h>
-#if defined(AFS_DARWIN70_ENV)
#include <vfs/vfs_support.h>
-#endif /* defined(AFS_DARWIN70_ENV) */
#ifdef AFS_DARWIN80_ENV
#include <sys/vnode_if.h>
#include <sys/kauth.h>
int afs_vop_symlink(struct VOPPROT(symlink_args) *);
int afs_vop_readdir(struct VOPPROT(readdir_args) *);
int afs_vop_readlink(struct VOPPROT(readlink_args) *);
-#if !defined(AFS_DARWIN70_ENV)
-extern int ufs_abortop(struct vop_abortop_args *);
-#endif /* !defined(AFS_DARWIN70_ENV) */
int afs_vop_inactive(struct VOPPROT(inactive_args) *);
int afs_vop_reclaim(struct VOPPROT(reclaim_args) *);
int afs_vop_strategy(struct VOPPROT(strategy_args) *);
{VOPPREF(readdir_desc), (VOPFUNC)afs_vop_readdir}, /* readdir */
{VOPPREF(readlink_desc), (VOPFUNC)afs_vop_readlink}, /* readlink */
#ifndef AFS_DARWIN80_ENV
-#if defined(AFS_DARWIN70_ENV)
{VOPPREF(abortop_desc), (VOPFUNC)nop_abortop }, /* abortop */
-#else /* ! defined(AFS_DARWIN70_ENV) */
- /* Yes, we use the ufs_abortop call. It just releases the namei
- * buffer stuff */
- {VOPPREF(abortop_desc), (VOPFUNC)ufs_abortop}, /* abortop */
-#endif /* defined(AFS_DARWIN70_ENV) */
#endif
{VOPPREF(inactive_desc), (VOPFUNC)afs_vop_inactive}, /* inactive */
{VOPPREF(reclaim_desc), (VOPFUNC)afs_vop_reclaim}, /* reclaim */
int error;
struct vnode *vp = ap->a_vp;
struct vcache *vc = VTOAFS(vp);
-#if defined(AFS_DARWIN14_ENV) && !defined(AFS_DARWIN80_ENV)
+#if !defined(AFS_DARWIN80_ENV)
int didhold = 0;
/*----------------------------------------------------------------
* osi_VM_TryReclaim() removes the ubcinfo of a vnode, but that vnode
if (vp->v_type == VREG && !(vp->v_flag & VSYSTEM)
&& vp->v_ubcinfo->ui_refcount < 2)
didhold = ubc_hold(vp);
-#endif /* AFS_DARWIN14_ENV */
+#endif /* !AFS_DARWIN80_ENV */
AFS_GLOCK();
error = afs_open(&vc, ap->a_mode, vop_cred);
#ifdef DIAGNOSTIC
#endif
osi_FlushPages(vc, vop_cred);
AFS_GUNLOCK();
-#if defined(AFS_DARWIN14_ENV) && !defined(AFS_DARWIN80_ENV)
+#if !defined(AFS_DARWIN80_ENV)
if (error && didhold)
ubc_rele(vp);
-#endif /* AFS_DARWIN14_ENV */
+#endif /* !AFS_DARWIN80_ENV */
return error;
}
case _PC_PIPE_BUF:
return EINVAL;
break;
-#if defined(AFS_DARWIN70_ENV)
case _PC_NAME_CHARS_MAX:
*ap->a_retval = NAME_MAX;
break;
case _PC_CASE_PRESERVING:
*ap->a_retval = 1;
break;
-#endif /* defined(AFS_DARWIN70_ENV) */
default:
return EINVAL;
}
printf("\n UBC: ");
if (UBCINFOEXISTS(vp)) {
printf("exists, ");
-#ifdef AFS_DARWIN14_ENV
printf("refs %d%s%s", vp->v_ubcinfo->ui_refcount,
ubc_issetflags(vp, UI_HASOBJREF) ? " HASOBJREF" : "",
ubc_issetflags(vp, UI_WASMAPPED) ? " WASMAPPED" : "");
-#else
- printf("holdcnt %d", vp->v_ubcinfo->ui_holdcnt);
-#endif
} else
printf("does not exist");
}
attrs->va_fsid = avc->v.v_vfsp->vfs_fsid.val[0];
#elif defined(AFS_DARWIN80_ENV)
VATTR_RETURN(attrs, va_fsid, vfs_statfs(vnode_mount(AFSTOV(avc)))->f_fsid.val[0]);
-#elif defined(AFS_DARWIN70_ENV)
+#elif defined(AFS_DARWIN_ENV)
attrs->va_fsid = avc->v->v_mount->mnt_stat.f_fsid.val[0];
-#else /* ! AFS_DARWIN70_ENV */
+#else /* ! AFS_DARWIN_ENV */
attrs->va_fsid = 1;
#endif
if (avc->mvstat == 2) {
#ifdef AFS_SGI62_ENV
#include "h/hashing.h"
#endif
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) && !defined(AFS_DARWIN_ENV)
#include <netinet/in_var.h>
#endif
#endif /* !UKERNEL */
#ifdef AFS_SGI62_ENV
#include "h/hashing.h"
#endif
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_DARWIN_ENV)
#include "netinet/in_var.h"
#endif
#endif /* !defined(UKERNEL) */
#ifdef AFS_SGI62_ENV
#include "h/hashing.h"
#endif
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV)
#include <netinet/in_var.h>
#endif /* ! AFS_HPUX110_ENV */
#endif /* !defined(UKERNEL) */
#ifdef AFS_SGI62_ENV
#include "h/hashing.h"
#endif
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) && !defined(AFS_DARWIN_ENV)
#include <netinet/in_var.h>
#endif
#endif /* !UKERNEL */
#ifdef AFS_SGI62_ENV
#include "h/hashing.h"
#endif
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_DARWIN_ENV)
#include "netinet/in_var.h"
#endif
#endif /* !defined(UKERNEL) */
#ifdef AFS_SGI62_ENV
#include "h/hashing.h"
#endif
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_DARWIN_ENV)
#include "netinet/in_var.h"
#endif
#endif /* !defined(UKERNEL) */
#ifdef AFS_SGI62_ENV
#include "h/hashing.h"
#endif
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV)
#include <netinet/in_var.h>
#endif /* AFS_HPUX110_ENV */
-#ifdef AFS_DARWIN60_ENV
+#ifdef AFS_DARWIN_ENV
#include <net/if_var.h>
#endif
#endif /* !defined(UKERNEL) */
return;
}
#else /* AFS_USERSPACE_IP_ADDR */
-#if (! defined(AFS_SUN5_ENV)) && !defined(AFS_DARWIN60_ENV) && defined(USEIFADDR)
+#if (! defined(AFS_SUN5_ENV)) && !defined(AFS_DARWIN_ENV) && defined(USEIFADDR)
void
afsi_SetServerIPRank(struct srvAddr *sa, struct in_ifaddr *ifa)
{
#endif /* IFF_POINTTOPOINT */
}
#endif /*(!defined(AFS_SUN5_ENV)) && defined(USEIFADDR) */
-#if defined(AFS_DARWIN60_ENV) && defined(USEIFADDR)
+#if defined(AFS_DARWIN_ENV) && defined(USEIFADDR)
#ifndef afs_min
#define afs_min(A,B) ((A)<(B)) ? (A) : (B)
#endif
ifnet_list_free(ifns);
}
}
-#elif defined(AFS_DARWIN60_ENV)
+#elif defined(AFS_DARWIN_ENV)
{
rx_ifnet_t ifn;
rx_ifaddr_t ifa;
TAILQ_FOREACH(ifa, &ifn->if_addrhead, ifa_link) {
afsi_SetServerIPRank(sa, ifa);
}}}
-#elif defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#elif defined(AFS_FBSD_ENV)
{
struct in_ifaddr *ifa;
TAILQ_FOREACH(ifa, &in_ifaddrhead, ia_link) {
#ifdef AFS_SGI62_ENV
#include "h/hashing.h"
#endif
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_DARWIN_ENV)
#include "netinet/in_var.h"
#endif
#endif /* !defined(UKERNEL) */
#ifdef AFS_SGI62_ENV
#include "h/hashing.h"
#endif
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV)
#include <netinet/in_var.h>
#endif /* ! AFS_HPUX110_ENV */
#endif /* !defined(UKERNEL) */
#ifdef AFS_SGI62_ENV
#include "h/hashing.h"
#endif
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV)
#include <netinet/in_var.h>
#endif /* ! AFS_HPUX110_ENV */
#endif /* !defined(UKERNEL) */
#ifdef AFS_SGI62_ENV
#include "h/hashing.h"
#endif
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV)
#include <netinet/in_var.h>
#endif /* ! AFS_HPUX110_ENV */
#endif /* !defined(UKERNEL) */
#ifdef AFS_SGI62_ENV
#include "h/hashing.h"
#endif
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV)
#include <netinet/in_var.h>
#endif /* ! AFS_HPUX110_ENV */
#endif /* !defined(UKERNEL) */
else \
sprintf(dumpname, "%s (DumpId %u)", name, dbDumpId);
-#if defined(AFS_NT40_ENV) || (defined(AFS_DARWIN_ENV) && !defined(AFS_DARWIN60_ENV)) || defined(AFS_SUN4_ENV)
+#if defined(AFS_NT40_ENV) || defined(AFS_SUN4_ENV)
int
localtime_r(time_t * t, struct tm *tm)
{
SHLIB_LINKER="${MT_CC} -shared"
;;
- ppc_darwin_12)
- CC="cc"
- CCOBJ="cc"
- MT_CC="cc"
- AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
- LEX="lex -l"
- REGEX_OBJ="regex.o"
- XCFLAGS="-traditional-cpp"
- SHLIB_LINKER="${MT_CC} -dynamiclib"
- SHLIB_SUFFIX="dylib"
- ;;
-
- ppc_darwin_13)
- CC="cc"
- CCOBJ="cc"
- MT_CC="cc"
- AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
- LEX="lex -l"
- LWP_OPTMZ="-O2"
- REGEX_OBJ="regex.o"
- XCFLAGS="-no-cpp-precomp"
- SHLIB_LINKER="${MT_CC} -dynamiclib"
- SHLIB_SUFFIX="dylib"
- ;;
-
- ppc_darwin_14)
- CC="cc"
- CCOBJ="cc"
- MT_CC="cc"
- AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
- LEX="lex -l"
- LWP_OPTMZ="-O2"
- REGEX_OBJ="regex.o"
- XCFLAGS="-no-cpp-precomp"
- SHLIB_LINKER="${MT_CC} -dynamiclib"
- SHLIB_SUFFIX="dylib"
- ;;
-
- ppc_darwin_60)
- CC="cc"
- CCOBJ="cc"
- MT_CC="cc"
- AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
- LEX="lex -l"
- LWP_OPTMZ="-O2"
- REGEX_OBJ="regex.o"
- XCFLAGS="-no-cpp-precomp"
- TXLIBS="-lncurses"
- SHLIB_LINKER="${MT_CC} -dynamiclib"
- SHLIB_SUFFIX="dylib"
- ;;
-
ppc_darwin_70)
CC="cc"
CCOBJ="cc"
#ifdef HAVE_LIBINTL
#include <libintl.h>
#endif
-#ifdef AFS_DARWIN70_ENV
+#ifdef AFS_DARWIN_ENV
#include <CoreFoundation/CoreFoundation.h>
#endif
#include <afs/errors.h>
return "unknown volume error";
}
-#ifdef AFS_DARWIN70_ENV
+#ifdef AFS_DARWIN_ENV
static_inline const char *
_intlize(const char *msg, int base, char *str, size_t len)
{
+++ /dev/null
-#ifndef UKERNEL
-/* This section for kernel libafs compiles only */
-
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-#define AFS_ENV 1
-#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */
-#define AFS_PPC_ENV 1
-#define AFS_VFSINCL_ENV 1
-
-#include <afs/afs_sysnames.h>
-
-#define AFS_DARWIN_ENV
-#undef AFS_NONFSTRANS
-#define AFS_NONFSTRANS
-#define AFS_SYSCALL 230
-#define DARWIN_REFBASE 0
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS "afs"
-
-/* Machine / Operating system information */
-#define sys_ppc_darwin_12 1
-#define SYS_NAME "ppc_darwin_12"
-#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_12
-#define AFSBIG_ENDIAN 1
-#define AFS_HAVE_FFS 1 /* Use system's ffs. */
-
-#define AFS_GCPAGS 1 /* if nonzero, garbage collect PAGs */
-#define RXK_LISTENER_ENV 1
-
-#ifdef KERNEL
-#undef MACRO_BEGIN
-#undef MACRO_END
-#include <kern/macro_help.h>
-#define AFS_GLOBAL_SUNLOCK 1
-#define AFS_VFS34 1 /* What is VFS34??? */
-#define afsio_iov uio_iov
-#define afsio_iovcnt uio_iovcnt
-#define afsio_offset uio_offset
-#define afsio_seg uio_segflg
-#define afsio_resid uio_resid
-#define AFS_UIOSYS UIO_SYSSPACE
-#define AFS_UIOUSER UIO_USERSPACE
-#define AFS_CLBYTES CLBYTES
-#define osi_GetTime(x) microtime(x)
-#define AFS_KALLOC(x) kalloc(x)
-#define AFS_KFREE(x,y) kfree(x,y)
-#define v_count v_usecount
-#define v_vfsp v_mount
-#define vfs_bsize mnt_stat.f_bsize
-#define vfs_fsid mnt_stat.f_fsid
-#define va_nodeid va_fileid
-#define vfs_vnodecovered mnt_vnodecovered
-#define direct dirent
-#define vnode_t struct vnode
-
-#define VN_RELE(vp) vrele(((struct vnode *)(vp)))
-#define VN_HOLD(vp) VREF(((struct vnode *)(vp)))
-
-#endif
-#endif /* AFS_PARAM_H */
-
-#else /* !defined(UKERNEL) */
-
-/* This section for user space compiles only */
-
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-#define AFS_VFSINCL_ENV 1 /* NOBODY uses this.... */
-#define AFS_ENV 1
-#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */
-#define AFS_PPC_ENV 1
-
-#include <afs/afs_sysnames.h>
-#define AFS_USERSPACE_ENV
-#define AFS_USR_DARWIN_ENV
-#undef AFS_NONFSTRANS
-#define AFS_NONFSTRANS
-#define AFS_SYSCALL 230
-#define DARWIN_REFBASE 0
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS "afs"
-
-/* Machine / Operating system information */
-#define sys_ppc_darwin_12 1
-#define SYS_NAME "ppc_darwin_12"
-#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_12
-#define AFSBIG_ENDIAN 1
-#define AFS_HAVE_FFS 1 /* Use system's ffs. */
-
-#define AFS_UIOSYS UIO_SYSSPACE
-#define AFS_UIOUSER UIO_USERSPACE
-
-#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
-#define RXK_LISTENER_ENV 1
-
-#define AFS_VFS34 1 /* What is VFS34??? */
-#define afsio_iov uio_iov
-#define afsio_iovcnt uio_iovcnt
-#define afsio_offset uio_offset
-#define afsio_seg uio_segflg
-#define afsio_resid uio_resid
-#define AFS_UIOSYS UIO_SYSSPACE
-#define AFS_UIOUSER UIO_USERSPACE
-#define VATTR_NULL usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
-
-#endif /* !defined(UKERNEL) */
+++ /dev/null
-#ifndef UKERNEL
-/* This section for kernel libafs compiles only */
-
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-#define AFS_ENV 1
-#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */
-#define AFS_PPC_ENV 1
-#define AFS_VFSINCL_ENV 1
-
-#include <afs/afs_sysnames.h>
-
-#define AFS_DARWIN_ENV
-#define AFS_DARWIN13_ENV
-#undef AFS_NONFSTRANS
-#define AFS_NONFSTRANS
-#define AFS_SYSCALL 230
-#define DARWIN_REFBASE 0
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS "afs"
-
-/* Machine / Operating system information */
-#define sys_ppc_darwin_12 1
-#define sys_ppc_darwin_13 1
-#define SYS_NAME "ppc_darwin_13"
-#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_13
-#define AFSBIG_ENDIAN 1
-#define AFS_HAVE_FFS 1 /* Use system's ffs. */
-
-#define AFS_GCPAGS 1 /* if nonzero, garbage collect PAGs */
-#define RXK_LISTENER_ENV 1
-
-#ifdef KERNEL
-#undef MACRO_BEGIN
-#undef MACRO_END
-#include <kern/macro_help.h>
-#define AFS_GLOBAL_SUNLOCK 1
-#define AFS_VFS34 1 /* What is VFS34??? */
-#define afsio_iov uio_iov
-#define afsio_iovcnt uio_iovcnt
-#define afsio_offset uio_offset
-#define afsio_seg uio_segflg
-#define afsio_resid uio_resid
-#define AFS_UIOSYS UIO_SYSSPACE
-#define AFS_UIOUSER UIO_USERSPACE
-#define AFS_CLBYTES CLBYTES
-#define osi_GetTime(x) microtime(x)
-#define AFS_KALLOC(x) kalloc(x)
-#define AFS_KFREE(x,y) kfree(x,y)
-#define v_count v_usecount
-#define v_vfsp v_mount
-#define vfs_bsize mnt_stat.f_bsize
-#define vfs_fsid mnt_stat.f_fsid
-#define va_nodeid va_fileid
-#define vfs_vnodecovered mnt_vnodecovered
-#define direct dirent
-#define vnode_t struct vnode
-
-#define VN_RELE(vp) vrele(((struct vnode *)(vp)))
-#define VN_HOLD(vp) VREF(((struct vnode *)(vp)))
-
-#endif
-#endif /* AFS_PARAM_H */
-
-#else /* !defined(UKERNEL) */
-
-/* This section for user space compiles only */
-
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-#define AFS_VFSINCL_ENV 1 /* NOBODY uses this.... */
-#define AFS_ENV 1
-#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */
-#define AFS_PPC_ENV 1
-
-#include <afs/afs_sysnames.h>
-#define AFS_USERSPACE_ENV
-#define AFS_USR_DARWIN_ENV
-#define AFS_USR_DARWIN13_ENV
-#undef AFS_NONFSTRANS
-#define AFS_NONFSTRANS
-#define AFS_SYSCALL 230
-#define DARWIN_REFBASE 0
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS "afs"
-
-/* Machine / Operating system information */
-#define sys_ppc_darwin_12 1
-#define sys_ppc_darwin_13 1
-#define SYS_NAME "ppc_darwin_13"
-#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_13
-#define AFSBIG_ENDIAN 1
-#define AFS_HAVE_FFS 1 /* Use system's ffs. */
-
-#define AFS_UIOSYS UIO_SYSSPACE
-#define AFS_UIOUSER UIO_USERSPACE
-
-#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
-#define RXK_LISTENER_ENV 1
-
-#define AFS_VFS34 1 /* What is VFS34??? */
-#define afsio_iov uio_iov
-#define afsio_iovcnt uio_iovcnt
-#define afsio_offset uio_offset
-#define afsio_seg uio_segflg
-#define afsio_resid uio_resid
-#define AFS_UIOSYS UIO_SYSSPACE
-#define AFS_UIOUSER UIO_USERSPACE
-#define VATTR_NULL usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
-
-#endif /* !defined(UKERNEL) */
+++ /dev/null
-#ifndef UKERNEL
-/* This section for kernel libafs compiles only */
-
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-#define AFS_ENV 1
-#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */
-#define AFS_PPC_ENV 1
-#define AFS_VFSINCL_ENV 1
-
-#include <afs/afs_sysnames.h>
-
-#define AFS_DARWIN_ENV
-#define AFS_DARWIN13_ENV
-#define AFS_DARWIN14_ENV
-#undef AFS_NONFSTRANS
-#define AFS_NONFSTRANS
-#define AFS_SYSCALL 230
-#define AFS_NAMEI_ENV 1
-#define DARWIN_REFBASE 0
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS "afs"
-
-/* Machine / Operating system information */
-#define sys_ppc_darwin_12 1
-#define sys_ppc_darwin_13 1
-#define sys_ppc_darwin_14 1
-#define SYS_NAME "ppc_darwin_14"
-#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_14
-#define AFSBIG_ENDIAN 1
-#define AFS_HAVE_FFS 1 /* Use system's ffs. */
-
-#define AFS_GCPAGS 1 /* if nonzero, garbage collect PAGs */
-#define RXK_LISTENER_ENV 1
-
-#ifdef KERNEL
-#undef MACRO_BEGIN
-#undef MACRO_END
-#include <kern/macro_help.h>
-#define AFS_GLOBAL_SUNLOCK 1
-#define AFS_VFS34 1 /* What is VFS34??? */
-#define afsio_iov uio_iov
-#define afsio_iovcnt uio_iovcnt
-#define afsio_offset uio_offset
-#define afsio_seg uio_segflg
-#define afsio_resid uio_resid
-#define AFS_UIOSYS UIO_SYSSPACE
-#define AFS_UIOUSER UIO_USERSPACE
-#define AFS_CLBYTES CLBYTES
-#define osi_GetTime(x) microtime(x)
-#define AFS_KALLOC(x) kalloc(x)
-#define AFS_KFREE(x,y) kfree(x,y)
-#define v_count v_usecount
-#define v_vfsp v_mount
-#define vfs_bsize mnt_stat.f_bsize
-#define vfs_fsid mnt_stat.f_fsid
-#define va_nodeid va_fileid
-#define vfs_vnodecovered mnt_vnodecovered
-#define direct dirent
-#define vnode_t struct vnode
-
-#define VN_RELE(vp) vrele(((struct vnode *)(vp)))
-#define VN_HOLD(vp) VREF(((struct vnode *)(vp)))
-
-#endif
-#endif /* AFS_PARAM_H */
-
-#else /* !defined(UKERNEL) */
-
-/* This section for user space compiles only */
-
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-#define AFS_VFSINCL_ENV 1 /* NOBODY uses this.... */
-#define AFS_ENV 1
-#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */
-#define AFS_PPC_ENV 1
-
-#include <afs/afs_sysnames.h>
-#define AFS_USERSPACE_ENV
-#define AFS_USR_DARWIN_ENV
-#define AFS_USR_DARWIN13_ENV
-#define AFS_USR_DARWIN14_ENV
-#undef AFS_NONFSTRANS
-#define AFS_NONFSTRANS
-#define AFS_SYSCALL 230
-#define DARWIN_REFBASE 0
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS "afs"
-
-/* Machine / Operating system information */
-#define sys_ppc_darwin_12 1
-#define sys_ppc_darwin_13 1
-#define sys_ppc_darwin_14 1
-#define SYS_NAME "ppc_darwin_14"
-#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_14
-#define AFSBIG_ENDIAN 1
-#define AFS_HAVE_FFS 1 /* Use system's ffs. */
-
-#define AFS_UIOSYS UIO_SYSSPACE
-#define AFS_UIOUSER UIO_USERSPACE
-
-#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
-#define RXK_LISTENER_ENV 1
-
-#define AFS_VFS34 1 /* What is VFS34??? */
-#define afsio_iov uio_iov
-#define afsio_iovcnt uio_iovcnt
-#define afsio_offset uio_offset
-#define afsio_seg uio_segflg
-#define afsio_resid uio_resid
-#define AFS_UIOSYS UIO_SYSSPACE
-#define AFS_UIOUSER UIO_USERSPACE
-#define VATTR_NULL usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
-
-#endif /* !defined(UKERNEL) */
+++ /dev/null
-#ifndef UKERNEL
-/* This section for kernel libafs compiles only */
-
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-#define AFS_ENV 1
-#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */
-#define AFS_PPC_ENV 1
-#define AFS_VFSINCL_ENV 1
-
-#include <afs/afs_sysnames.h>
-
-#define AFS_DARWIN_ENV
-#define AFS_DARWIN13_ENV
-#define AFS_DARWIN14_ENV
-#define AFS_DARWIN60_ENV
-#undef AFS_NONFSTRANS
-#define AFS_NONFSTRANS
-#define AFS_SYSCALL 230
-#define AFS_NAMEI_ENV 1
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS "afs"
-
-/* Machine / Operating system information */
-#define sys_ppc_darwin_12 1
-#define sys_ppc_darwin_13 1
-#define sys_ppc_darwin_14 1
-#define sys_ppc_darwin_60 1
-#define SYS_NAME "ppc_darwin_60"
-#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_60
-#define AFSBIG_ENDIAN 1
-#define AFS_HAVE_FFS 1 /* Use system's ffs. */
-
-#define AFS_GCPAGS 1 /* if nonzero, garbage collect PAGs */
-#define RXK_LISTENER_ENV 1
-
-#ifdef KERNEL
-#undef MACRO_BEGIN
-#undef MACRO_END
-#include <kern/macro_help.h>
-#define AFS_GLOBAL_SUNLOCK 1
-#define AFS_VFS34 1 /* What is VFS34??? */
-#define afsio_iov uio_iov
-#define afsio_iovcnt uio_iovcnt
-#define afsio_offset uio_offset
-#define afsio_seg uio_segflg
-#define afsio_resid uio_resid
-#define AFS_UIOSYS UIO_SYSSPACE
-#define AFS_UIOUSER UIO_USERSPACE
-#define AFS_CLBYTES CLBYTES
-#define osi_GetTime(x) microtime(x)
-#define AFS_KALLOC(x) kalloc(x)
-#define AFS_KFREE(x,y) kfree(x,y)
-#define v_count v_usecount
-#define v_vfsp v_mount
-#define vfs_bsize mnt_stat.f_bsize
-#define vfs_fsid mnt_stat.f_fsid
-#define va_nodeid va_fileid
-#define vfs_vnodecovered mnt_vnodecovered
-#define direct dirent
-#define vnode_t struct vnode
-
-#define VN_RELE(vp) vrele(((struct vnode *)(vp)))
-#define VN_HOLD(vp) VREF(((struct vnode *)(vp)))
-
-#endif
-#endif /* AFS_PARAM_H */
-
-#else /* !defined(UKERNEL) */
-
-/* This section for user space compiles only */
-
-#ifndef AFS_PARAM_H
-#define AFS_PARAM_H
-
-#define AFS_VFSINCL_ENV 1 /* NOBODY uses this.... */
-#define AFS_ENV 1
-#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */
-#define AFS_PPC_ENV 1
-
-#include <afs/afs_sysnames.h>
-#define AFS_USERSPACE_ENV
-#define AFS_USR_DARWIN_ENV
-#define AFS_USR_DARWIN13_ENV
-#define AFS_USR_DARWIN14_ENV
-#define AFS_USR_DARWIN60_ENV
-#undef AFS_NONFSTRANS
-#define AFS_NONFSTRANS
-#define AFS_SYSCALL 230
-
-/* File system entry (used if mount.h doesn't define MOUNT_AFS */
-#define AFS_MOUNT_AFS "afs"
-
-/* Machine / Operating system information */
-#define sys_ppc_darwin_12 1
-#define sys_ppc_darwin_13 1
-#define sys_ppc_darwin_14 1
-#define sys_ppc_darwin_60 1
-#define SYS_NAME "ppc_darwin_60"
-#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_60
-#define AFSBIG_ENDIAN 1
-#define AFS_HAVE_FFS 1 /* Use system's ffs. */
-
-#define AFS_UIOSYS UIO_SYSSPACE
-#define AFS_UIOUSER UIO_USERSPACE
-
-#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
-#define RXK_LISTENER_ENV 1
-
-#define AFS_VFS34 1 /* What is VFS34??? */
-#define afsio_iov uio_iov
-#define afsio_iovcnt uio_iovcnt
-#define afsio_offset uio_offset
-#define afsio_seg uio_segflg
-#define afsio_resid uio_resid
-#define AFS_UIOSYS UIO_SYSSPACE
-#define AFS_UIOUSER UIO_USERSPACE
-#define VATTR_NULL usr_vattr_null
-
-#define AFS_DIRENT
-#ifndef CMSERVERPREF
-#define CMSERVERPREF
-#endif
-
-#endif /* AFS_PARAM_H */
-
-#endif /* !defined(UKERNEL) */
#include <afs/afs_sysnames.h>
#define AFS_DARWIN_ENV
-#define AFS_DARWIN13_ENV
-#define AFS_DARWIN14_ENV
-#define AFS_DARWIN60_ENV
#define AFS_DARWIN70_ENV
#undef AFS_NONFSTRANS
#define AFS_NONFSTRANS
#include <afs/afs_sysnames.h>
#define AFS_USERSPACE_ENV
#define AFS_USR_DARWIN_ENV
-#define AFS_USR_DARWIN13_ENV
-#define AFS_USR_DARWIN14_ENV
-#define AFS_USR_DARWIN60_ENV
#define AFS_USR_DARWIN70_ENV
#undef AFS_NONFSTRANS
#define AFS_NONFSTRANS
#include <afs/afs_sysnames.h>
#define AFS_DARWIN_ENV
-#define AFS_DARWIN13_ENV
-#define AFS_DARWIN14_ENV
-#define AFS_DARWIN60_ENV
#define AFS_DARWIN70_ENV
#define AFS_DARWIN80_ENV
#undef AFS_NONFSTRANS
#include <afs/afs_sysnames.h>
#define AFS_USERSPACE_ENV
#define AFS_USR_DARWIN_ENV
-#define AFS_USR_DARWIN13_ENV
-#define AFS_USR_DARWIN14_ENV
-#define AFS_USR_DARWIN60_ENV
#define AFS_USR_DARWIN70_ENV
#define AFS_USR_DARWIN80_ENV
#undef AFS_NONFSTRANS
#include <afs/afs_sysnames.h>
#define AFS_DARWIN_ENV
-#define AFS_DARWIN13_ENV
-#define AFS_DARWIN14_ENV
-#define AFS_DARWIN60_ENV
#define AFS_DARWIN70_ENV
#define AFS_DARWIN80_ENV
#define AFS_DARWIN90_ENV
#include <afs/afs_sysnames.h>
#define AFS_USERSPACE_ENV
#define AFS_USR_DARWIN_ENV
-#define AFS_USR_DARWIN13_ENV
-#define AFS_USR_DARWIN14_ENV
-#define AFS_USR_DARWIN60_ENV
#define AFS_USR_DARWIN70_ENV
#define AFS_USR_DARWIN80_ENV
#define AFS_USR_DARWIN90_ENV
#include <afs/afs_sysnames.h>
#define AFS_DARWIN_ENV
-#define AFS_DARWIN13_ENV
-#define AFS_DARWIN14_ENV
-#define AFS_DARWIN60_ENV
#define AFS_DARWIN70_ENV
#define AFS_DARWIN80_ENV
#define AFS_DARWIN90_ENV
#include <afs/afs_sysnames.h>
#define AFS_USERSPACE_ENV
#define AFS_USR_DARWIN_ENV
-#define AFS_USR_DARWIN13_ENV
-#define AFS_USR_DARWIN14_ENV
-#define AFS_USR_DARWIN60_ENV
#define AFS_USR_DARWIN70_ENV
#define AFS_USR_DARWIN80_ENV
#define AFS_USR_DARWIN90_ENV
#include <afs/afs_sysnames.h>
#define AFS_DARWIN_ENV
-#define AFS_DARWIN13_ENV
-#define AFS_DARWIN14_ENV
-#define AFS_DARWIN60_ENV
#define AFS_DARWIN70_ENV
#define AFS_DARWIN80_ENV
#undef AFS_NONFSTRANS
#include <afs/afs_sysnames.h>
#define AFS_USERSPACE_ENV
#define AFS_USR_DARWIN_ENV
-#define AFS_USR_DARWIN13_ENV
-#define AFS_USR_DARWIN14_ENV
-#define AFS_USR_DARWIN60_ENV
#define AFS_USR_DARWIN70_ENV
#define AFS_USR_DARWIN80_ENV
#undef AFS_NONFSTRANS
#include <afs/afs_sysnames.h>
#define AFS_DARWIN_ENV
-#define AFS_DARWIN13_ENV
-#define AFS_DARWIN14_ENV
-#define AFS_DARWIN60_ENV
#define AFS_DARWIN70_ENV
#define AFS_DARWIN80_ENV
#define AFS_DARWIN90_ENV
#include <afs/afs_sysnames.h>
#define AFS_USERSPACE_ENV
#define AFS_USR_DARWIN_ENV
-#define AFS_USR_DARWIN13_ENV
-#define AFS_USR_DARWIN14_ENV
-#define AFS_USR_DARWIN60_ENV
#define AFS_USR_DARWIN70_ENV
#define AFS_USR_DARWIN80_ENV
#define AFS_USR_DARWIN90_ENV
#if defined(AFS_SUN56_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DARWIN80_ENV)
#include "afs/sysincludes.h"
#endif
-#if !defined(AFS_SGI64_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_SGI64_ENV) && !defined(AFS_DARWIN_ENV)
#include "h/user.h"
#endif /* AFS_SGI64_ENV */
#include "h/uio.h"
struct gator_cursesgwin *cwp; /*Curses-specific data */
cwp = (struct gator_cursesgwin *)(gwp->w_data);
-#if defined(AFS_DARWIN_ENV) && !defined(AFS_DARWIN60_ENV)
- aparms->maxx = cwp->wp->maxx;
- aparms->maxy = cwp->wp->maxy;
-#elif defined(AFS_NBSD_ENV) || defined(AFS_DARWIN100_ENV)
+#if defined(AFS_NBSD_ENV) || defined(AFS_DARWIN100_ENV)
aparms->maxx = getmaxx(cwp->wp);
aparms->maxy = getmaxy(cwp->wp);
#else
--- /dev/null
+#!/bin/sh
+majorvers=`uname -r | sed 's/\..*//'`
+if [ $majorvers -ne 7 ]; then
+ exit 112
+fi
+
+# check for temporary versions of ThisCell and CellAlias
+# and move them aside
+tmpthiscell=/private/tmp/org.OpenAFS.Install.ThisCell.$USER
+tmpcellalias=/private/tmp/org.OpenAFS.Install.CellAlias.$USER
+date=`date +%Y%m%d%H%M`
+if [ -e $tmpthiscell ]; then
+ mv -f $tmpthiscell $tmpthiscell.$date
+fi
+if [ -e $tmpcellalias ]; then
+ mv -f $tmpcellalias $tmpcellalias.$date
+fi
+
+exit 0
--- /dev/null
+"16" = "This OpenAFS release requires Panther (10.3)";
--- /dev/null
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf250
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww9000\viewh9000\viewkind0
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\fs24 \cf0 This release of OpenAFS is targeted at MacOS 10.3. (Panther)\
+\
+The included afssettings program is distributed under the Apple Public Source License, version 2.0. See http://www.opensource.apple.com/apsl/2.0.txt or the included file 2.0.txt.\
+\
+Reboot when all of this is done.}
\ No newline at end of file
#include <sys/malloc.h>
#include <sys/namei.h>
#include <sys/ubc.h>
-#if defined(AFS_DARWIN70_ENV)
#include <vfs/vfs_support.h>
-#endif /* defined(AFS_DARWIN70_ENV) */
lck_grp_t * openafs_lck_grp;
static lck_grp_attr_t * openafs_lck_grp_attr;
*/
#define CV_INIT(cv,a,b,c)
#define CV_DESTROY(cv)
-#ifdef AFS_DARWIN14_ENV
#ifdef AFS_DARWIN80_ENV
#define CV_WAIT(cv, lck) do { \
int isGlockOwner = ISAFS_GLOCK(); \
#endif
#define CV_SIGNAL(cv) wakeup_one((void *)(cv))
#define CV_BROADCAST(cv) wakeup((void *)(cv))
-#else
-#define CV_WAIT(cv, lck) { \
- int isGlockOwner = ISAFS_GLOCK(); \
- if (isGlockOwner) AFS_GUNLOCK(); \
- assert_wait((event_t)(cv), 0); \
- MUTEX_EXIT(lck); \
- thread_block(0); \
- if (isGlockOwner) AFS_GLOCK(); \
- MUTEX_ENTER(lck); \
- }
-
-#define CV_TIMEDWAIT(cv,lck,t) { \
- int isGlockOwner = ISAFS_GLOCK(); \
- if (isGlockOwner) AFS_GUNLOCK(); \
- assert_wait((event_t)(cv), 0); \
- thread_set_timer(t, NSEC_PER_SEC/hz); \
- MUTEX_EXIT(lck); \
- thread_block(0); \
- if (isGlockOwner) AFS_GLOCK(); \
- MUTEX_ENTER(lck); \
- }
-
-#define CV_SIGNAL(cv) thread_wakeup_one((event_t)(cv))
-#define CV_BROADCAST(cv) thread_wakeup((event_t)(cv))
-#endif
#ifdef AFS_DARWIN80_ENV
typedef struct {
return different;
}
-#if defined(AFS_DARWIN60_ENV) || defined(AFS_XBSD_ENV)
+#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
/* Returns ifnet which best matches address */
rx_ifnet_t
rxi_FindIfnet(afs_uint32 addr, afs_uint32 * maskp)
return (ifad ? rx_ifaddr_ifnet(ifad) : NULL);
}
-#else /* DARWIN60 || XBSD */
+#else /* DARWIN || XBSD */
/* Returns ifnet which best matches address */
rx_ifnet_t
*maskp = ifad->ia_subnetmask;
return (ifad ? ifad->ia_ifp : NULL);
}
-#endif /* else DARWIN60 || XBSD */
+#endif /* else DARWIN || XBSD */
#endif /* else AFS_USERSPACE_IP_ADDR */
#endif /* !SUN5 && !SGI62 */
#include "netinet/in_systm.h"
#endif
#include "netinet/ip.h"
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV) && !defined(AFS_OBSD_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_OBSD_ENV)
#include "netinet/in_pcb.h"
#endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX22_ENV */
#ifndef AFS_LINUX22_ENV
-#if !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_DARWIN_ENV)
#include "netinet/ip_var.h"
#endif
#include "netinet/ip_icmp.h"
#endif /* AFS_LINUX22_ENV */
#include "netinet/udp.h"
-#if !defined(AFS_SGI62_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_SGI62_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV)
#include "netinet/udp_var.h"
#endif
#if defined(AFS_HPUX102_ENV) || (defined(AFS_SGI62_ENV) && !defined(AFS_SGI64_ENV))
#endif
#include "net/if.h"
#endif
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV)
#include "netinet/in_var.h"
#endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX22_ENV */
#if !defined(AFS_LINUX22_ENV) && !defined(AFS_DUX40_ENV)
#if defined(AFS_AIX_ENV) || defined(AFS_AUX_ENV) || defined(AFS_SUN5_ENV)
#include "h/systm.h"
#endif
-#if defined(AFS_DARWIN60_ENV) || defined(AFS_OBSD_ENV)
+#if defined(AFS_DARWIN_ENV) || defined(AFS_OBSD_ENV)
#include "h/kernel.h"
#endif
#include "h/types.h"
static struct {
void (*handler) (int);
int pending;
-#if !(defined(AFS_DARWIN60_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD50_ENV)))
+#if !(defined(AFS_DARWIN_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD50_ENV)))
int fatal;
-#endif /* !defined(AFS_DARWIN60_ENV) || !defined(AFS_NBSD_ENV) */
+#endif /* !defined(AFS_DARWIN_ENV) || !defined(AFS_NBSD_ENV) */
int inited;
} softsig_sigs[NSIG];
pthread_sigmask(SIG_BLOCK, &ss, &os);
pthread_sigmask(SIG_SETMASK, &os, NULL);
sigaddset(&ss, SIGUSR1);
-#if defined(AFS_DARWIN60_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD50_ENV))
+#if defined(AFS_DARWIN_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD50_ENV))
pthread_sigmask (SIG_BLOCK, &ss, NULL);
sigdelset (&os, SIGUSR1);
#elif !defined(AFS_HPUX_ENV)
softsig_sigs[i].fatal = 1;
}
}
-#endif /* defined(AFS_DARWIN60_ENV) || defined(AFS_NBSD_ENV) */
+#endif /* defined(AFS_DARWIN_ENV) || defined(AFS_NBSD_ENV) */
while (1) {
void (*h) (int);
-#if !defined(AFS_DARWIN60_ENV) && !defined(AFS_NBSD_ENV)
+#if !defined(AFS_DARWIN_ENV) && !defined(AFS_NBSD_ENV)
int sigw;
#endif
for (i = 0; i < NSIG; i++) {
if (softsig_sigs[i].handler && !softsig_sigs[i].inited) {
sigaddset(&ss, i);
-#if defined(AFS_DARWIN60_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD50_ENV))
+#if defined(AFS_DARWIN_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD50_ENV))
pthread_sigmask (SIG_BLOCK, &ss, NULL);
sigdelset (&os, i);
-#endif /* defined(AFS_DARWIN60_ENV) || defined(AFS_NBSD_ENV) */
+#endif /* defined(AFS_DARWIN_ENV) || defined(AFS_NBSD_ENV) */
softsig_sigs[i].inited = 1;
}
if (softsig_sigs[i].pending) {
}
}
if (i == NSIG) {
-#if defined(AFS_DARWIN60_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD50_ENV))
+#if defined(AFS_DARWIN_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD50_ENV))
sigsuspend (&os);
-#else /* !defined(AFS_DARWIN60_ENV) && !defined(AFS_NBSD_ENV) */
+#else /* !defined(AFS_DARWIN_ENV) && !defined(AFS_NBSD_ENV) */
sigwait(&ss, &sigw);
if (sigw != SIGUSR1) {
if (softsig_sigs[sigw].fatal)
exit(0);
softsig_sigs[sigw].pending = 1;
}
-#endif /* defined(AFS_DARWIN60_ENV) || defined(AFS_NBSD_ENV) */
+#endif /* defined(AFS_DARWIN_ENV) || defined(AFS_NBSD_ENV) */
} else if (h)
h(i);
}