Mercurial > illumos > git > illumos-gate
changeset 20225:f6742874f445
13413 svc.startd: 'contract_list_pool' is multiply-defined
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: C Fraire <cfraire@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| author | Toomas Soome <tsoome@me.com> |
|---|---|
| date | Mon, 25 May 2020 15:49:16 +0300 |
| parents | 3fa93b6d354f |
| children | 05ca2a211f76 |
| files | usr/src/cmd/svc/startd/restarter.c usr/src/cmd/svc/startd/startd.h |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/svc/startd/restarter.c Tue Nov 03 02:16:48 2020 +0000 +++ b/usr/src/cmd/svc/startd/restarter.c Mon May 25 15:49:16 2020 +0300 @@ -135,6 +135,7 @@ #include "startd.h" #include "protocol.h" +uu_list_pool_t *contract_list_pool; static uu_list_pool_t *restarter_instance_pool; static restarter_instance_list_t instance_list;
--- a/usr/src/cmd/svc/startd/startd.h Tue Nov 03 02:16:48 2020 +0000 +++ b/usr/src/cmd/svc/startd/startd.h Mon May 25 15:49:16 2020 +0300 @@ -325,7 +325,7 @@ * * Currently, only relevant for GVT_SVC and GVT_INST type vertices. */ - int gv_refs; + int gv_refs; int32_t gv_stn_tset; int32_t gv_reason; @@ -564,7 +564,7 @@ extern volatile uint16_t storing_contract; -uu_list_pool_t *contract_list_pool; +extern uu_list_pool_t *contract_list_pool; /* contract.c */ ctid_t contract_init(void);