diff options
| author | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-04-08 13:40:16 +0300 |
|---|---|---|
| committer | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-04-08 13:40:16 +0300 |
| commit | e969cd526e3a1ebfd5d957aa367b820ee3e61979 (patch) | |
| tree | 06a63cb399aa0331af2f310f1ca370eb1adc7c8e /src | |
| parent | 7f1e83eece2672a0ce182d2e0bf7c6be13aeec34 (diff) | |
| parent | 373af7f0ea3045822e1f57e0a3e5306c06707805 (diff) | |
.......... [DEV-2113] refactored zbxtypes.h, sysinc.h and config.h headers
Diffstat (limited to 'src')
| -rw-r--r-- | src/go/pkg/tls/tls.go | 2 | ||||
| -rw-r--r-- | src/go/pkg/zbxlib/checks.go | 1 | ||||
| -rw-r--r-- | src/libs/zbxalgo/algodefs.h | 1 | ||||
| -rw-r--r-- | src/libs/zbxcrypto/tls.c | 2 | ||||
| -rw-r--r-- | src/libs/zbxnix/pid.h | 2 | ||||
| -rw-r--r-- | src/libs/zbxsysinfo/win32/wmi.cpp | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/src/go/pkg/tls/tls.go b/src/go/pkg/tls/tls.go index 4514eb8ec3c..b989e76ae6b 100644 --- a/src/go/pkg/tls/tls.go +++ b/src/go/pkg/tls/tls.go @@ -29,7 +29,7 @@ package tls #include <string.h> #include <unistd.h> #include <ctype.h> -#include "config.h" +#include "common/config.h" #define TLS_UNUSED(var) (void)(var) diff --git a/src/go/pkg/zbxlib/checks.go b/src/go/pkg/zbxlib/checks.go index 24bf205c3ab..81d461b2490 100644 --- a/src/go/pkg/zbxlib/checks.go +++ b/src/go/pkg/zbxlib/checks.go @@ -23,6 +23,7 @@ package zbxlib /* #cgo CFLAGS: -I${SRCDIR}/../../../../include +#cgo CFLAGS: -I${SRCDIR}/../../../../include/common #include "common.h" #include "sysinfo.h" 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/zbxcrypto/tls.c b/src/libs/zbxcrypto/tls.c index 86b0e3a7f2b..c9a009ea49f 100644 --- a/src/libs/zbxcrypto/tls.c +++ b/src/libs/zbxcrypto/tls.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "sysinc.h" +#include "zbxsysinc.h" #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) 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" diff --git a/src/libs/zbxsysinfo/win32/wmi.cpp b/src/libs/zbxsysinfo/win32/wmi.cpp index 375446ad765..ce1206a0482 100644 --- a/src/libs/zbxsysinfo/win32/wmi.cpp +++ b/src/libs/zbxsysinfo/win32/wmi.cpp @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "sysinc.h" +#include "zbxsysinc.h" extern "C" { |