DEVEL15-darwin90-updates-20060813

make things compile cleanly

(cherry picked from commit 202efcf9f5707785ba4c7dab05de9d8dba11952c)

diff --git a/src/bozo/bnode.c b/src/bozo/bnode.c
index 952e592..fd9603a 100644 (file)
--- a/src/bozo/bnode.c
+++ b/src/bozo/bnode.c
@@ -738,7 +738,9 @@ hdl_notifier(struct bnode_proc *tp)
 
 #if defined(AFS_HPUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_SGI51_ENV)
        ec = setsid();
-#elif defined(AFS_LINUX20_ENV) || defined(AFS_AIX_ENV)
+#elif defined(AFS_DARWIN90_ENV)
+       ec = setpgid(0, 0);
+#elif defined(AFS_LINUX20_ENV) || defined(AFS_AIX_ENV) 
        ec = setpgrp();
 #else
        ec = setpgrp(0, 0);

diff --git a/src/rx/xdr_array.c b/src/rx/xdr_array.c
index 62fcfba..41776ec 100644 (file)
--- a/src/rx/xdr_array.c
+++ b/src/rx/xdr_array.c
@@ -52,7 +52,9 @@ RCSID
 #define bzero(A,C) memset((A), 0, (C))
 #endif
 #else
+#ifndef AFS_DARWIN90_ENV
 #include <sys/systm.h>
+#endif
 #endif /* AFS_LINUX20_ENV */
 #else
 #include <stdio.h>