From ca0f1946a2f0a75be7de6aa0ac083ffebc950624 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Tue, 5 Jul 2011 09:27:05 +0100 Subject: [PATCH] volser: Don't declare cstruct twice Both vsprocs.c and vsutils.c declare the global variable 'cstruct' (which is initialised by vos.c in order to pass a ubik client structure through to many of the libvolser functions). This double declaration prevents libvolser from being linked as a shared library on some platforms. We only need one of these, so just make vsprocs.c declare it, and vsutils.c refer to it as an extern. Of course, using a global variable to pass state around is really quite nasty, but let's fix that in another change. Change-Id: Ief1667bd7a5b70dbfb49cdc02cc435eb2344527e Reviewed-on: http://gerrit.openafs.org/5362 Tested-by: BuildBot Reviewed-by: Derrick Brashear Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/volser/vsprocs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/volser/vsprocs.c b/src/volser/vsprocs.c index ef6ef757d..3c126eebf 100644 --- a/src/volser/vsprocs.c +++ b/src/volser/vsprocs.c @@ -53,7 +53,7 @@ #include "vsutils_prototypes.h" #include "lockprocs_prototypes.h" -struct ubik_client *cstruct; +extern struct ubik_client *cstruct; int verbose = 0, noresolve = 0; struct release { -- 2.39.5