From: Dave Botsch <botsch@cnf.cornell.edu>
Date: Wed, 28 Oct 2015 15:53:26 +0000 (-0400)
Subject: rxinit_status needs to be global for the kext since
X-Git-Tag: upstream/1.8.0_pre1^2~171
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f3145b0de0e7718e0ad741ee826764e284fc8b3a;p=packages%2Fo%2Fopenafs.git

rxinit_status needs to be global for the kext since
RXK_UPCALL_ENV is defined in src/rx/DARWIN/rx_knet.c

Change-Id: I23b535f0cd6b45c3e186319c4bacf5b6c5a93681
Reviewed-on: http://gerrit.openafs.org/12073
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
---

diff --git a/src/rx/rx.c b/src/rx/rx.c
index b90e34614..161365ea9 100644
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -447,7 +447,7 @@ struct rx_serverQueueEntry *rx_waitForPacket = 0;
  * by the kernel.  Whether this will ever overlap anything in
  * /etc/services is anybody's guess...  Returns 0 on success, -1 on
  * error. */
-#ifndef AFS_NT40_ENV
+#if !(defined(AFS_NT40_ENV) || defined(RXK_UPCALL_ENV))
 static
 #endif
 rx_atomic_t rxinit_status = RX_ATOMIC_INIT(1);