From: Benjamin Kaduk <kaduk@mit.edu>
Date: Fri, 15 Jun 2018 13:39:47 +0000 (-0500)
Subject: Comment out opr_AssertionFailed from afsrpc.def
X-Git-Tag: upstream/1.8.1_pre2^2~6
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ef568fbb1980764e9b21660bc224a53c5601a8ce;p=packages%2Fo%2Fopenafs.git

Comment out opr_AssertionFailed from afsrpc.def

Apparently the Windows utilities link opr.lib directly, so this
caused a "multiply defined symbol" error.

Reviewed-on: https://gerrit.openafs.org/13216
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit 907e09ff2b7e86005765a594db27e1df194ec204)

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

diff --git a/src/libafsrpc/afsrpc.def b/src/libafsrpc/afsrpc.def
index 7c9e7cb01..310f8d418 100755
--- a/src/libafsrpc/afsrpc.def
+++ b/src/libafsrpc/afsrpc.def
@@ -344,7 +344,7 @@ EXPORTS
 	tkt_MakeTicket5                         @349
 	tkt_DeriveDesKey                        @350
 ;	opr_AssertFailU                         @351
-	opr_AssertionFailed                     @352
+;	opr_AssertionFailed                     @352
 ;	xdr_Capabilities                        @353
 	xdr_rpcStats                            @354