From 888fd8e287a6acc9313963d4d9b9af69127c0490 Mon Sep 17 00:00:00 2001 From: Mikko Lehto Date: Fri, 15 Jan 2016 15:42:38 +0200 Subject: [PATCH 1/2] modules/ims_icscf: removes values.h dependency Did not compile on FreeBSD 10. --- modules/ims_icscf/cxdx_lir.c | 4 +--- modules/ims_icscf/scscf_list.c | 5 ----- modules/ims_icscf/scscf_list.h | 6 +----- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/modules/ims_icscf/cxdx_lir.c b/modules/ims_icscf/cxdx_lir.c index be18eb728d0..f1731bf21df 100644 --- a/modules/ims_icscf/cxdx_lir.c +++ b/modules/ims_icscf/cxdx_lir.c @@ -51,10 +51,8 @@ #include "mod.h" #include "location.h" -#if defined (__OS_freebsd) -#include "sys/limits.h" +#include "limits.h" #define MAXINT INT_MAX -#endif //we use pseudo variables to communicate back to config file this takes the result and converys to a return code, publishes it a pseudo variable int create_lia_return_code(int result) { diff --git a/modules/ims_icscf/scscf_list.c b/modules/ims_icscf/scscf_list.c index 1d21ba3a128..ee8b74392d0 100644 --- a/modules/ims_icscf/scscf_list.c +++ b/modules/ims_icscf/scscf_list.c @@ -47,11 +47,6 @@ #include "db.h" #include "../../lib/ims/useful_defs.h" -#if defined (__OS_freebsd) -#include "sys/limits.h" -#define MAXINT INT_MAX -#endif - extern int scscf_entry_expiry; //time for scscf entries to remain the scscf_list extern struct tm_binds tmb; //Structure with pointers to tm funcs diff --git a/modules/ims_icscf/scscf_list.h b/modules/ims_icscf/scscf_list.h index b3d4cfd3722..ba29e1cfbe1 100644 --- a/modules/ims_icscf/scscf_list.h +++ b/modules/ims_icscf/scscf_list.h @@ -49,20 +49,16 @@ #include "../../sr_module.h" #include "../../modules/tm/tm_load.h" #include "mod.h" -#ifndef __OS_darwin -#include -#endif +#include #include "../../mem/shm_mem.h" #include "../../dset.h" #include "../../timer.h" -#ifdef __OS_darwin #ifndef MAXINT #define MAXINT INT_MAX #endif -#endif /** S-CSCF list element */ From 5ac088f705468edffcef5cb669bbe28e4f3a905b Mon Sep 17 00:00:00 2001 From: Mikko Lehto Date: Wed, 3 Feb 2016 21:31:03 +0200 Subject: [PATCH 2/2] modules/ims_icscf: use INT_MAX instead of MAXINT --- modules/ims_icscf/cxdx_lir.c | 5 +---- modules/ims_icscf/scscf_list.c | 4 ++-- modules/ims_icscf/scscf_list.h | 5 ----- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/modules/ims_icscf/cxdx_lir.c b/modules/ims_icscf/cxdx_lir.c index f1731bf21df..9e056f25bfc 100644 --- a/modules/ims_icscf/cxdx_lir.c +++ b/modules/ims_icscf/cxdx_lir.c @@ -51,9 +51,6 @@ #include "mod.h" #include "location.h" -#include "limits.h" -#define MAXINT INT_MAX - //we use pseudo variables to communicate back to config file this takes the result and converys to a return code, publishes it a pseudo variable int create_lia_return_code(int result) { int rc; @@ -181,7 +178,7 @@ void async_cdp_lir_callback(int is_timeout, void *param, AAAMessage *lia, long e success: if (server_name.len) { - list = new_scscf_entry(server_name, MAXINT, data->orig); + list = new_scscf_entry(server_name, INT_MAX, data->orig); } else { list = I_get_capab_ordered(server_name, m_capab, m_capab_cnt, o_capab, o_capab_cnt, p_server_names, p_server_names_cnt, data->orig); } diff --git a/modules/ims_icscf/scscf_list.c b/modules/ims_icscf/scscf_list.c index ee8b74392d0..36342854b49 100644 --- a/modules/ims_icscf/scscf_list.c +++ b/modules/ims_icscf/scscf_list.c @@ -183,10 +183,10 @@ scscf_entry* I_get_capab_ordered(str scscf_name, int *m, int mcnt, int *o, int o scscf_entry *list = 0; int i, r; - if (scscf_name.len) list = I_add_to_scscf_list(list, scscf_name, MAXINT, orig); + if (scscf_name.len) list = I_add_to_scscf_list(list, scscf_name, INT_MAX, orig); for (i = 0; i < pcnt; i++) - list = I_add_to_scscf_list(list, p[i], MAXINT - i, orig); + list = I_add_to_scscf_list(list, p[i], INT_MAX - i, orig); for (i = 0; i < SCSCF_Capabilities_cnt; i++) { r = I_get_capab_match(SCSCF_Capabilities + i, m, mcnt, o, ocnt); diff --git a/modules/ims_icscf/scscf_list.h b/modules/ims_icscf/scscf_list.h index ba29e1cfbe1..3b72ba74885 100644 --- a/modules/ims_icscf/scscf_list.h +++ b/modules/ims_icscf/scscf_list.h @@ -56,11 +56,6 @@ #include "../../timer.h" -#ifndef MAXINT -#define MAXINT INT_MAX -#endif - - /** S-CSCF list element */ typedef struct _scscf_entry { str scscf_name; /**< SIP URI of the S-CSCF */