diff --git a/modules/ims_icscf/cxdx_lir.c b/modules/ims_icscf/cxdx_lir.c index faabd85..24686e7 100644 --- a/modules/ims_icscf/cxdx_lir.c +++ b/modules/ims_icscf/cxdx_lir.c @@ -51,6 +51,11 @@ #include "mod.h" #include "location.h"
+#if defined (__OS_freebsd) +#include "sys/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) { int rc; diff --git a/modules/ims_icscf/scscf_list.c b/modules/ims_icscf/scscf_list.c index bd5216c..8b6b79c 100644 --- a/modules/ims_icscf/scscf_list.c +++ b/modules/ims_icscf/scscf_list.c @@ -47,6 +47,11 @@ #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
Hello,
thanks for checking on bsd, can you please sent the patch as attachment? Because it can saved locally and applied easier.
Cheers, Daniel
On 3/15/13 8:43 AM, Victor V. Kustov wrote:
diff --git a/modules/ims_icscf/cxdx_lir.c b/modules/ims_icscf/cxdx_lir.c index faabd85..24686e7 100644 --- a/modules/ims_icscf/cxdx_lir.c +++ b/modules/ims_icscf/cxdx_lir.c @@ -51,6 +51,11 @@ #include "mod.h" #include "location.h"
+#if defined (__OS_freebsd) +#include "sys/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) { int rc;
diff --git a/modules/ims_icscf/scscf_list.c b/modules/ims_icscf/scscf_list.c index bd5216c..8b6b79c 100644 --- a/modules/ims_icscf/scscf_list.c +++ b/modules/ims_icscf/scscf_list.c @@ -47,6 +47,11 @@ #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
В Fri, 15 Mar 2013 08:55:28 +0100 Daniel-Constantin Mierla miconda@gmail.com пишет:
Hello,
thanks for checking on bsd, can you please sent the patch as attachment? Because it can saved locally and applied easier.
Thanks, applied to master and 4.0 branches.
Cheers, Daniel
On 3/15/13 9:01 AM, Victor V. Kustov wrote:
В Fri, 15 Mar 2013 08:55:28 +0100 Daniel-Constantin Mierla miconda@gmail.com пишет:
Hello,
thanks for checking on bsd, can you please sent the patch as attachment? Because it can saved locally and applied easier.
On 2013-03-15 at 11:43, Victor V. Kustov wrote:
diff --git a/modules/ims_icscf/cxdx_lir.c b/modules/ims_icscf/cxdx_lir.c index faabd85..24686e7 100644 --- a/modules/ims_icscf/cxdx_lir.c +++ b/modules/ims_icscf/cxdx_lir.c @@ -51,6 +51,11 @@ #include "mod.h" #include "location.h"
+#if defined (__OS_freebsd) +#include "sys/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) { int rc; diff --git a/modules/ims_icscf/scscf_list.c b/modules/ims_icscf/scscf_list.c index bd5216c..8b6b79c 100644 --- a/modules/ims_icscf/scscf_list.c +++ b/modules/ims_icscf/scscf_list.c @@ -47,6 +47,11 @@ #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
This should be simply fixed by using INT_MAX instead of the deprecated MAXINT definition from values.h on Linux.
Patch attached uses INT_MAX consistently in the module and removes the need for OS dependent definitions.
Compiles fine on RHEL 6.4 and FreeBSD 9.0.
-
Daniel-Constantin Mierla -
Victor V. Kustov -
Øyvind Kolbu