[sr-dev] git:5.4:0df03a96: ims_charging: renamed str_list_t to str_htlist_t

Module: kamailio Branch: 5.4 Commit: 0df03a96e9ed07ff1683690f95598bf44b87701a URL: https://github.com/kamailio/kamailio/commit/0df03a96e9ed07ff1683690f95598bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-03T09:18:36+01:00 ims_charging: renamed str_list_t to str_htlist_t - fix conflict added by e1dc6dd6d9b206168f6da2929560ca6a64e1b41e (cherry picked from commit 1f751775525fdcdb5a75b45fbf451e2bef3696ec) --- Modified: src/modules/ims_charging/Ro_data.h --- Diff: https://github.com/kamailio/kamailio/commit/0df03a96e9ed07ff1683690f95598bf… Patch: https://github.com/kamailio/kamailio/commit/0df03a96e9ed07ff1683690f95598bf… --- diff --git a/src/modules/ims_charging/Ro_data.h b/src/modules/ims_charging/Ro_data.h index 6ad045c191..ba0aba3420 100644 --- a/src/modules/ims_charging/Ro_data.h +++ b/src/modules/ims_charging/Ro_data.h @@ -131,9 +131,9 @@ typedef struct _str_list_t_slot { struct _str_list_t_slot *prev, *next; } str_list_slot_t; -typedef struct { +typedef struct str_htlist { str_list_slot_t *head, *tail; -} str_list_t; +} str_htlist_t; #define str_list_t_free(x,mem) \ do{\ @@ -163,7 +163,7 @@ typedef struct { typedef struct { str *application_server; - str_list_t application_provided_called_party_address; + str_htlist_t application_provided_called_party_address; } as_info_t; typedef struct _as_info_list_t_slot { @@ -194,7 +194,7 @@ do{\ #define as_info_list_t_copy(dst,src,mem) \ do {\ str_dup_ptr_ptr((dst)->info.application_server,(src)->info.application_server,mem);\ - WL_DUP_ALL(&((dst)->info.application_provided_called_party_address),&((src)->info.application_provided_called_party_address),str_list_t,mem);\ + WL_DUP_ALL(&((dst)->info.application_provided_called_party_address),&((src)->info.application_provided_called_party_address),str_htlist_t,mem);\ } while(0) typedef struct { @@ -268,9 +268,9 @@ typedef struct { str *user_session_id; str *outgoing_session_id; - str_list_t calling_party_address; + str_htlist_t calling_party_address; str *called_party_address; - str_list_t called_asserted_identity; + str_htlist_t called_asserted_identity; str *requested_party_address; str *access_network_info; str *app_provided_party;