diff options
author | Andris Zeila <andris.zeila@zabbix.com> | 2021-04-30 09:54:36 +0300 |
---|---|---|
committer | Andris Zeila <andris.zeila@zabbix.com> | 2021-04-30 09:54:36 +0300 |
commit | aa3cc7255b8949a6de3559f2402496d16e4ee578 (patch) | |
tree | 56dbe09d9a136c5aeef17ea126ab12b2d58007f7 /include/zbxtypes.h | |
parent | 5359e133a4cd3620e75bb5f992db9d888a3b5ff7 (diff) | |
parent | 83691c877e373dbeff1d441b31462fc3adbbbc3b (diff) |
.......... [ZBXNEXT-6452] merged branch 'master' of ssh://git.zabbix.lan:7999/zbx/zabbix into feature/ZBXNEXT-6452-5.3
Diffstat (limited to 'include/zbxtypes.h')
-rw-r--r-- | include/zbxtypes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/zbxtypes.h b/include/zbxtypes.h index 779e58ff0f8..0a101530c4e 100644 --- a/include/zbxtypes.h +++ b/include/zbxtypes.h @@ -214,7 +214,7 @@ zbx_uint128_t; /* macro to test if a signed value has been assigned to unsigned type (char, short, int, long long) */ #define ZBX_IS_TOP_BIT_SET(x) (0 != ((__UINT64_C(1) << ((sizeof(x) << 3) - 1)) & (x))) -#if defined(_WINDOWS) +#if defined(_WINDOWS) || defined(__MINGW32__) #define localtime_r(x, y) localtime_s(y, x) #endif |