diff options
| -rw-r--r-- | ChangeLog.d/bugfix/ZBX-16317 | 1 | ||||
| -rw-r--r-- | include/log.h | 2 | ||||
| -rw-r--r-- | src/libs/zbxdb/db.c | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-16317 b/ChangeLog.d/bugfix/ZBX-16317 new file mode 100644 index 00000000000..7df3fbc1e85 --- /dev/null +++ b/ChangeLog.d/bugfix/ZBX-16317 @@ -0,0 +1 @@ +...G...PS. [ZBX-16317] fixed log.h is not self-sufficient (akozlovs) diff --git a/include/log.h b/include/log.h index 2f6bd5a773a..c09628c74a6 100644 --- a/include/log.h +++ b/include/log.h @@ -20,6 +20,8 @@ #ifndef ZABBIX_LOG_H #define ZABBIX_LOG_H +#include "common.h" + #define LOG_LEVEL_EMPTY 0 /* printing nothing (if not LOG_LEVEL_INFORMATION set) */ #define LOG_LEVEL_CRIT 1 #define LOG_LEVEL_ERR 2 diff --git a/src/libs/zbxdb/db.c b/src/libs/zbxdb/db.c index 28aa1f8c371..0a54bf558bf 100644 --- a/src/libs/zbxdb/db.c +++ b/src/libs/zbxdb/db.c @@ -340,9 +340,9 @@ static int is_recoverable_mysql_error(void) return FAIL; } #elif defined(HAVE_POSTGRESQL) -static int is_recoverable_postgresql_error(const PGconn *conn, const PGresult *pg_result) +static int is_recoverable_postgresql_error(const PGconn *pg_conn, const PGresult *pg_result) { - if (CONNECTION_OK != PQstatus(conn)) + if (CONNECTION_OK != PQstatus(pg_conn)) return SUCCEED; if (0 == zbx_strcmp_null(PQresultErrorField(pg_result, PG_DIAG_SQLSTATE), "40P01")) |