From: Benjamin Kaduk <kaduk@mit.edu>
Date: Wed, 15 Oct 2014 21:52:22 +0000 (-0400)
Subject: Avoid AFS_version conflicts in uafs
X-Git-Tag: upstream/1.8.0_pre1^2~497
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=67d168511e716d12cc68476a7fda7e984e2ff96a;p=packages%2Fo%2Fopenafs.git

Avoid AFS_version conflicts in uafs

libuafs links in both afsd.o and AFS_component_version_number.o;
afsd.c #includes AFS_component_Version_number.c, which causes
symbol conflicts when linking shared.

Don't include the version file when compiling for UKERNEL, to
avoid the conflict.

Change-Id: I9474faf10e029d0022b12431aad51e27412b19fc
Reviewed-on: http://gerrit.openafs.org/11544
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: D Brashear <shadow@your-file-system.com>
---

diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c
index 3097610aa..5b7ede258 100644
--- a/src/afsd/afsd.c
+++ b/src/afsd/afsd.c
@@ -2463,7 +2463,9 @@ afsd_run(void)
     return 0;
 }
 
+#ifndef UKERNEL
 #include "AFS_component_version_number.c"
+#endif
 
 void
 afsd_init(void)