From: Derrick Brashear <shadow@dementia.org>
Date: Wed, 10 Feb 2010 04:45:23 +0000 (-0500)
Subject: remove osi_Panic prototype on irix
X-Git-Tag: openafs-devel-1_5_72~7
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=64c24e84f9a0a96deac62cb3377577eadd582811;p=packages%2Fo%2Fopenafs.git

remove osi_Panic prototype on irix

just don't prototype this on irix

Change-Id: If9f6e6ef1eb4fcfcfbc81f7d69af00f72acfd517
Reviewed-on: http://gerrit.openafs.org/1285
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h
index 84ce66ecc..d9f067c65 100644
--- a/src/rx/rx_prototypes.h
+++ b/src/rx/rx_prototypes.h
@@ -374,9 +374,9 @@ extern osi_socket rxi_GetHostUDPSocket(u_int host, u_short port);
 # undef osi_Assert
 # define osi_Assert(expr) \
     do { if (!(expr)) { osi_AssertFailK(#expr, __FILE__, __LINE__); BUG(); } } while (0)
-# elif (defined(AFS_AIX_ENV) && !defined(AFS_AIX61_ENV)) || defined(AFS_SGI_ENV)
+# elif (defined(AFS_AIX_ENV) && !defined(AFS_AIX61_ENV))
 extern void osi_Panic(char *fmt, void *a1, void *a2, void *a3);
-# elif defined(AFS_AIX61_ENV)
+# elif defined(AFS_AIX61_ENV) || defined(AFS_SGI_ENV)
 /* No prototype. Deliberate, since there's no vprintf et al */
 # else
 extern void osi_Panic(char *fmt, ...)