diff options
author | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-04-05 18:17:00 +0300 |
---|---|---|
committer | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-04-05 18:17:00 +0300 |
commit | ef83112a8c37eb93e219909c8506a958582acad6 (patch) | |
tree | 67de318d6c7345b7c9408943c1051ec7f43f0cb1 /src | |
parent | c64c35c671a7db0e1535bde2a26b806595ae8aee (diff) |
.......... [DEV-2113] fixed merge updates
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/zbxalgo/algodefs.h | 1 | ||||
-rw-r--r-- | src/libs/zbxnix/pid.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/libs/zbxalgo/algodefs.h b/src/libs/zbxalgo/algodefs.h index 36355330fb4..9e254c7f55a 100644 --- a/src/libs/zbxalgo/algodefs.h +++ b/src/libs/zbxalgo/algodefs.h @@ -21,5 +21,4 @@ #define ZABBIX_ALGO_H int next_prime(int n); - #endif /* ZABBIX_ALGO_H */ diff --git a/src/libs/zbxnix/pid.h b/src/libs/zbxnix/pid.h index d501d6d39cf..87628c3deb8 100644 --- a/src/libs/zbxnix/pid.h +++ b/src/libs/zbxnix/pid.h @@ -20,7 +20,7 @@ #ifndef ZABBIX_PID_H #define ZABBIX_PID_H -#include "sysinc.h" +#include "zbxsysinc.h" #ifdef _WINDOWS # error "This module allowed only for Unix OS" |