diff options
| author | Toomas Soome <tsoome@me.com> | 2020-05-25 15:49:16 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2021-01-11 17:46:24 +0200 |
| commit | 16d53a891df2f19b4dc37110081555be4e474d8c (patch) | |
| tree | c67a350fb5ae1c37db93219d0e20ccade65aa0ea /usr/src | |
| parent | 2606939d92dd3044a9851b2930ebf533c3c03892 (diff) | |
| download | illumos-joyent-16d53a891df2f19b4dc37110081555be4e474d8c.tar.gz | |
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>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/svc/startd/restarter.c | 1 | ||||
| -rw-r--r-- | usr/src/cmd/svc/startd/startd.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/cmd/svc/startd/restarter.c b/usr/src/cmd/svc/startd/restarter.c index 516004c894..70f84a06d6 100644 --- a/usr/src/cmd/svc/startd/restarter.c +++ b/usr/src/cmd/svc/startd/restarter.c @@ -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; diff --git a/usr/src/cmd/svc/startd/startd.h b/usr/src/cmd/svc/startd/startd.h index d230ed1490..a952144c93 100644 --- a/usr/src/cmd/svc/startd/startd.h +++ b/usr/src/cmd/svc/startd/startd.h @@ -325,7 +325,7 @@ typedef struct graph_vertex { * * 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 @@ typedef struct contract_entry { 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); |