From af9c575eaa06c3aefa737ceb3fd66116866a4abd Mon Sep 17 00:00:00 2001 From: Daniel-Constantin Mierla Date: Thu, 16 Jan 2020 11:23:40 +0100 Subject: [PATCH] htable: make ht_dmq_init_sync variable extern in ht_dmq.c - avoiding redeclaration, it is set via modparam (cherry picked from commit 02bff604ec70a51a5ba9faae38e946e556763e08) --- src/modules/htable/ht_dmq.c | 2 +- src/modules/htable/ht_dmq.h | 2 -- src/modules/htable/htable.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c index 26c6eb859af..ccb67e30d8c 100644 --- a/src/modules/htable/ht_dmq.c +++ b/src/modules/htable/ht_dmq.c @@ -48,7 +48,7 @@ static str dmq_500_rpl = str_init("Server Internal Error"); static int dmq_cell_group_empty_size = 12; // {"cells":[]} static int dmq_cell_group_max_size = 60000; static ht_dmq_jdoc_cell_group_t ht_dmq_jdoc_cell_group; -int ht_dmq_init_sync; +extern int ht_dmq_init_sync; dmq_api_t ht_dmqb; dmq_peer_t* ht_dmq_peer = NULL; diff --git a/src/modules/htable/ht_dmq.h b/src/modules/htable/ht_dmq.h index be11d4dc494..014dffbc6ae 100644 --- a/src/modules/htable/ht_dmq.h +++ b/src/modules/htable/ht_dmq.h @@ -31,8 +31,6 @@ extern dmq_api_t ht_dmqb; extern dmq_peer_t* ht_dmq_peer; extern dmq_resp_cback_t ht_dmq_resp_callback; -int ht_dmq_init_sync; - typedef enum { HT_DMQ_NONE, HT_DMQ_SET_CELL, diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 20282a6a4b6..443502078d3 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -224,7 +224,7 @@ static int mod_init(void) } } - if (ht_enable_dmq>0 && ht_dmq_initialize(ht_dmq_init_sync)!=0) { + if (ht_enable_dmq>0 && ht_dmq_initialize()!=0) { LM_ERR("failed to initialize dmq integration\n"); return -1; }