diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-06-28 19:39:27 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-06-28 19:39:27 +0000 |
| commit | 65dd1614dba5dc1c81e953480e04e38dfda67f67 (patch) | |
| tree | a0b947b27d9c3eefac9d8bd2ca8e4cca0d10cda1 /src | |
| parent | e08c804a632a1edbc463fb12f685b1bae054b0c5 (diff) | |
- fixed compilation of ZABBIX server under HP-UX (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@4387 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/zbxdb/db.c | 18 | ||||
| -rw-r--r-- | src/libs/zbxsysinfo/common/common.c | 1 | ||||
| -rw-r--r-- | src/zabbix_server/trapper/trapper.c | 9 |
3 files changed, 15 insertions, 13 deletions
diff --git a/src/libs/zbxdb/db.c b/src/libs/zbxdb/db.c index 5f8d76f0..86df930c 100644 --- a/src/libs/zbxdb/db.c +++ b/src/libs/zbxdb/db.c @@ -333,8 +333,9 @@ int zbx_db_vexecute(const char *fmt, va_list args) char *sql = NULL; int ret = ZBX_DB_OK; - struct timeval tv; - suseconds_t msec; +/* suseconds_t is not defined under UP-UX */ +/* struct timeval tv; + suseconds_t msec;*/ #ifdef HAVE_POSTGRESQL PGresult *result; @@ -343,8 +344,8 @@ int zbx_db_vexecute(const char *fmt, va_list args) char *error=0; #endif - gettimeofday(&tv, NULL); - msec = tv.tv_usec; +/* gettimeofday(&tv, NULL); + msec = tv.tv_usec;*/ sql = zbx_dvsprintf(sql, fmt, args); @@ -582,8 +583,9 @@ DB_RESULT zbx_db_vselect(const char *fmt, va_list args) char *sql = NULL; DB_RESULT result; - struct timeval tv; - suseconds_t msec; +/* suseconds_t is not defined under HP=UX */ +/* struct timeval tv; + suseconds_t msec;*/ #ifdef HAVE_ORACLE sqlo_stmt_handle_t sth; @@ -593,8 +595,8 @@ DB_RESULT zbx_db_vselect(const char *fmt, va_list args) char *error=NULL; #endif - gettimeofday(&tv, NULL); - msec = tv.tv_usec; +/* gettimeofday(&tv, NULL); + msec = tv.tv_usec;*/ sql = zbx_dvsprintf(sql, fmt, args); diff --git a/src/libs/zbxsysinfo/common/common.c b/src/libs/zbxsysinfo/common/common.c index aba029f4..f53edf11 100644 --- a/src/libs/zbxsysinfo/common/common.c +++ b/src/libs/zbxsysinfo/common/common.c @@ -311,7 +311,6 @@ lbl_exit: int EXECUTE_INT(const char *cmd, const char *command, unsigned flags, AGENT_RESULT *result) { int ret = SYSINFO_RET_FAIL; - double value = 0; ret = EXECUTE_STR(cmd,command,flags,result); diff --git a/src/zabbix_server/trapper/trapper.c b/src/zabbix_server/trapper/trapper.c index 92ff381c..796a35b8 100644 --- a/src/zabbix_server/trapper/trapper.c +++ b/src/zabbix_server/trapper/trapper.c @@ -176,10 +176,11 @@ void process_trapper_child(zbx_sock_t *sock) { char *data; - struct timeval tv; +/* suseconds_t is not defined under HP-UX */ +/* struct timeval tv; suseconds_t msec; gettimeofday(&tv, NULL); - msec = tv.tv_usec; + msec = tv.tv_usec;*/ /* alarm(CONFIG_TIMEOUT);*/ @@ -192,9 +193,9 @@ void process_trapper_child(zbx_sock_t *sock) process_trap(sock, data, sizeof(data)); /* alarm(0);*/ - gettimeofday(&tv, NULL); +/* gettimeofday(&tv, NULL); zabbix_log( LOG_LEVEL_DEBUG, "Trap processed in " ZBX_FS_DBL " seconds", - (double)(tv.tv_usec-msec)/1000000 ); + (double)(tv.tv_usec-msec)/1000000 );*/ } void child_trapper_main(int i, zbx_sock_t *s) |