macos: kernel socket upcall

[openafs.git] / src / config / param.x86_darwin_90.h

diff --git a/src/config/param.x86_darwin_90.h b/src/config/param.x86_darwin_90.h
index a62b855..f1e02a6 100644 (file)
--- a/src/config/param.x86_darwin_90.h
+++ b/src/config/param.x86_darwin_90.h
@@ -5,12 +5,11 @@
 #define AFS_PARAM_H
 
 #define AFS_ENV                 1
-#define AFS_64BIT_ENV           1      /* Defines afs_int32 as int, not long. */
 #define AFS_64BIT_CLIENT        1
 #define AFS_64BIT_IOPS_ENV     1
 #if defined(__ppc__)
 #define AFS_PPC_ENV            1
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
 #define AFS_X86_ENV            1
 #else
 #error Unsupported architecture
@@ -20,16 +19,15 @@
 #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
+#undef  AFS_NONFSTRANS
 #define AFS_NONFSTRANS
 #define AFS_SYSCALL             230
 #define AFS_NAMEI_ENV 1
 #define DARWIN_REFBASE 3
+#define AFS_WARNUSER_MARINER_ENV 1
 #define AFS_CACHE_VNODE_PATH
 
 /* File system entry (used if mount.h doesn't define MOUNT_AFS */
@@ -47,7 +45,7 @@
 #define SYS_NAME               "ppc_darwin_90"
 #define SYS_NAME_ID            SYS_NAME_ID_ppc_darwin_90
 #define AFSBIG_ENDIAN          1
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
 #define sys_x86_darwin_12      1
 #define sys_x86_darwin_13      1
 #define sys_x86_darwin_14      1
@@ -65,6 +63,7 @@
 
 #define AFS_GCPAGS               0
 #define RXK_LISTENER_ENV         1
+#define RXK_TIMEDSLEEP_ENV       1
 
 #ifdef KERNEL
 #undef MACRO_BEGIN
@@ -91,7 +90,6 @@
 #define vfs_vnodecovered mnt_vnodecovered
 #define direct          dirent
 
-#define BIND_8_COMPAT
 
 #endif
 #endif /* AFS_PARAM_H */
@@ -105,10 +103,9 @@
 
 #define AFS_VFSINCL_ENV 1      /* NOBODY uses this.... */
 #define AFS_ENV                 1
-#define AFS_64BIT_ENV           1      /* Defines afs_int32 as int, not long. */
 #if defined(__ppc__)
 #define AFS_PPC_ENV            1
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
 #define AFS_X86_ENV            1
 #else
 #error Unsupported architecture
@@ -117,15 +114,14 @@
 #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
+#undef  AFS_NONFSTRANS
 #define AFS_NONFSTRANS
 #define AFS_SYSCALL             230
 #define DARWIN_REFBASE 0
+#define AFS_WARNUSER_MARINER_ENV 1
 
 /* File system entry (used if mount.h doesn't define MOUNT_AFS */
 #define AFS_MOUNT_AFS    "afs"
@@ -142,7 +138,7 @@
 #define SYS_NAME               "ppc_darwin_90"
 #define SYS_NAME_ID            SYS_NAME_ID_ppc_darwin_90
 #define AFSBIG_ENDIAN          1
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
 #define sys_x86_darwin_12      1
 #define sys_x86_darwin_13      1
 #define sys_x86_darwin_14      1
@@ -179,7 +175,6 @@
 #define CMSERVERPREF
 #endif
 
-#define BIND_8_COMPAT
 #endif /* AFS_PARAM_H */
 
 #endif /* !defined(UKERNEL) */