diff options
author | Vladislavs Sokurenko <vladislavs.sokurenko@zabbix.com> | 2021-02-18 10:43:48 +0300 |
---|---|---|
committer | Vladislavs Sokurenko <vladislavs.sokurenko@zabbix.com> | 2021-02-18 10:44:40 +0300 |
commit | 91bbd90c2b092ed47d21c855972ef7f8e39306cb (patch) | |
tree | 78be8ebe64a0c6b4eb1f6788656edcf3e4dcc6c7 /include | |
parent | bf0e8d945b883d4ceb57d33fc3670219907aa47f (diff) |
.......PS. [ZBX-19029] fixed Zabbix server and Zabbix proxy not remembering last log size when preprocessing is used
.......PS. [ZBX-19029] fixed Zabbix server and Zabbix proxy not remembering last log size when preprocessing is used
* commit 'bd9f9476b9cf418dbdc8f225f7d14b2b9b0d8331':
.......PS. [ZBX-19029] revemod redundant space
.......PS. [ZBX-19029] cherry picked from 5.0 and fixed conflicts
(cherry picked from commit 5ad24488345014274ed2f452c58d6bdb817009f6)
Diffstat (limited to 'include')
-rw-r--r-- | include/module.h | 2 | ||||
-rw-r--r-- | include/sysinfo.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/module.h b/include/module.h index 816e04a7971..b504f20593b 100644 --- a/include/module.h +++ b/include/module.h @@ -96,7 +96,7 @@ typedef struct char *text; char *msg; /* possible error message */ zbx_log_t *log; - int type; /* flags: see AR_* above */ + int type; /* flags: see AR_* above */ int mtime; /* meta information */ } AGENT_RESULT; diff --git a/include/sysinfo.h b/include/sysinfo.h index d3a872a057b..00e100bcf3c 100644 --- a/include/sysinfo.h +++ b/include/sysinfo.h @@ -104,6 +104,7 @@ do \ } \ while (0) +/* AR_META is always excluded */ #define UNSET_RESULT_EXCLUDING(res, exc_type) \ \ do \ |