From 67d168511e716d12cc68476a7fda7e984e2ff96a Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Wed, 15 Oct 2014 17:52:22 -0400 Subject: [PATCH] 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 Reviewed-by: D Brashear --- src/afsd/afsd.c | 2 ++ 1 file changed, 2 insertions(+) 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) -- 2.39.5