diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-04-13 18:12:29 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-04-13 18:12:29 +0000 |
| commit | 9f031f243e5cff5e85f92ff9fdc4d3bc4151d71d (patch) | |
| tree | e2edb5f0794477215a1f2ca1d66ced5f41284825 | |
| parent | f44acd1c83594297a678a3936b5d7aafd3eb0dc5 (diff) | |
- fix compilation if no function atoll() (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@2739 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | src/libs/zbxcommon/misc.c | 8 | ||||
| -rw-r--r-- | src/zabbix_server/functions.c | 4 |
4 files changed, 13 insertions, 1 deletions
@@ -1,5 +1,6 @@ Changes for 1.1beta9: + - fix compilation if no function atoll() (Alexei) - fixed compilation issue in run_command() (Alexei) - added vertical text for OVERVIEW (Eugene) - fixed items status changing of parent hosts (Eugene) diff --git a/configure.in b/configure.in index f7789f51..0fdad3a7 100644 --- a/configure.in +++ b/configure.in @@ -446,6 +446,7 @@ AC_CHECK_FUNCS(vasprintf) AC_CHECK_FUNCS(asprintf) AC_CHECK_FUNCS(vsnprintf) AC_CHECK_FUNCS(hstrerror) +AC_CHECK_FUNCS(atoll) dnl Check if we want to compile everything with static AC_ARG_ENABLE(static,[ diff --git a/src/libs/zbxcommon/misc.c b/src/libs/zbxcommon/misc.c index 6c5ff3d4..04e27aef 100644 --- a/src/libs/zbxcommon/misc.c +++ b/src/libs/zbxcommon/misc.c @@ -124,7 +124,9 @@ int is_double(char *str) { const char *endstr = str + strlen(str); char *endptr = NULL; - double x = strtod(str, &endptr); + double x; + + x = strtod(str, &endptr); if(endptr == str || errno != 0) return FAIL; @@ -201,7 +203,11 @@ int set_result_type(AGENT_RESULT *result, int value_type, char *c) del_zeroes(c); if(is_uint(c) == SUCCEED) { +#ifdef HAVE_ATOLL SET_UI64_RESULT(result, atoll(c)); +#else + SET_UI64_RESULT(result, atol(c)); +#endif ret = SUCCEED; } } diff --git a/src/zabbix_server/functions.c b/src/zabbix_server/functions.c index 433cfc6a..aad597c0 100644 --- a/src/zabbix_server/functions.c +++ b/src/zabbix_server/functions.c @@ -836,7 +836,11 @@ void process_new_value(DB_ITEM *item, AGENT_RESULT *value) { if(is_uint(item->formula)) { +#ifdef HAVE_ATOLL SET_UI64_RESULT(value, value->ui64 * (zbx_uint64_t)atoll(item->formula)); +#else + SET_UI64_RESULT(value, value->ui64 * (zbx_uint64_t)atol(item->formula)); +#endif } else { |