From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 9 Jun 2009 22:06:15 +0000 (+0000)
Subject: DEVEL15-aix6-kernel-varargs-prototypes-ok-20090609
X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=3cd793a46eb6fa1924c97e85c43f3e42d82e0be6

DEVEL15-aix6-kernel-varargs-prototypes-ok-20090609

LICENSE IPL10

varargs style prototypes are ok in the aix6 kernel env


(cherry picked from commit 6794613924416dd542a1d54a9d692af396a0f0d9)
---

diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h
index 89b5600..9b114fe 100644
--- a/src/rx/rx_prototypes.h
+++ b/src/rx/rx_prototypes.h
@@ -363,7 +363,7 @@ extern osi_socket rxi_GetHostUDPSocket(u_int host, u_short port);
 #define osi_Assert(expr) \
     do { if (!(expr)) { osi_AssertFailK(#expr, __FILE__, __LINE__); BUG(); } } while (0)
 #else
-#if defined(KERNEL) && defined(AFS_AIX_ENV)
+#if defined(KERNEL) && (defined(AFS_AIX_ENV) && !defined(AFS_AIX61_ENV))
 extern void osi_Panic(char *fmt, void *a1, void *a2, void *a3);
 #else
 extern void osi_Panic(char *fmt, ...);