From: Dave Botsch <botsch@cnf.cornell.edu>
Date: Thu, 17 Nov 2016 18:22:17 +0000 (-0500)
Subject: Mac OS Sierra deprecates syscall()
X-Git-Tag: upstream/1.8.0_pre1^2~16
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=822ca15a0e760ad9f2c04cd177ca5634f85ee8d6;p=packages%2Fo%2Fopenafs.git

Mac OS Sierra deprecates syscall()

The syscall() function has been deprecated in MacOS 10.12 - Sierra. After
discussions with developers, it would appear that syscall() isn't really
needed, anymore, so we can just do away with it.

Change-Id: I60e4220168b097bbae7a5ebaceb2d32276aad3e5
Reviewed-on: https://gerrit.openafs.org/12452
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
---

diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c
index 598be2ba5..f135fac0e 100644
--- a/src/rx/rx_user.c
+++ b/src/rx/rx_user.c
@@ -437,7 +437,7 @@ fudge_netmask(afs_uint32 addr)
 
 
 
-#if !defined(AFS_AIX_ENV) && !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV)
+#if !defined(AFS_AIX_ENV) && !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN160_ENV)
 int
 rxi_syscall(afs_uint32 a3, afs_uint32 a4, void *a5)
 {
@@ -564,7 +564,7 @@ rx_GetIFInfo(void)
 	}
 #endif /* SIOCGIFFLAGS */
 
-#if !defined(AFS_AIX_ENV)  && !defined(AFS_LINUX20_ENV)
+#if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN160_ENV)
 	/* this won't run on an AIX system w/o a cache manager */
 	rxi_syscallp = rxi_syscall;
 #endif
diff --git a/src/viced/viced.c b/src/viced/viced.c
index 165ed5578..a8b6e337c 100644
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -312,7 +312,7 @@ fs_IsLocalRealmMatch(void *rock, char *name, char *inst, char *cell)
     return islocal;
 }
 
-#ifndef AFS_NT40_ENV
+#if !defined(AFS_NT40_ENV) && !defined(AFS_DARWIN160_ENV)
 int
 viced_syscall(afs_uint32 a3, afs_uint32 a4, void *a5)
 {
@@ -1963,7 +1963,7 @@ main(int argc, char *argv[])
     acl_Initialize(ACL_VERSION);
 
     /* initialize RX support */
-#ifndef AFS_NT40_ENV
+#if !defined(AFS_NT40_ENV) && !defined(AFS_DARWIN160_ENV)
     rxi_syscallp = viced_syscall;
 #endif
     rx_extraPackets = rxpackets;
diff --git a/src/volser/volmain.c b/src/volser/volmain.c
index d08869176..e4df19dbb 100644
--- a/src/volser/volmain.c
+++ b/src/volser/volmain.c
@@ -159,7 +159,7 @@ BKGLoop(void *unused)
     return NULL;
 }
 
-#ifdef AFS_NT40_ENV
+#if defined(AFS_NT40_ENV) || defined(AFS_DARWIN160_ENV)
 /* no volser_syscall */
 #elif defined(AFS_SUN511_ENV)
 int
@@ -504,7 +504,7 @@ main(int argc, char **argv)
 #ifndef AFS_PTHREAD_ENV
     vol_PollProc = IOMGR_Poll;	/* tell vol pkg to poll io system periodically */
 #endif
-#ifndef AFS_NT40_ENV
+#if !defined( AFS_NT40_ENV ) && !defined(AFS_DARWIN160_ENV)
     rxi_syscallp = volser_syscall;
 #endif
     rx_nPackets = rxpackets;	/* set the max number of packets */