.......... [ZBXNEXT-5546,ZBXNEXT-5548] upgraded to master

53 files changed, 61 insertions, 61 deletions

diff --git a/include/alias.h b/include/alias.h
index 4a9d7a775b0..ebe76261db8 100644
--- a/include/alias.h
+++ b/include/alias.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/base64.h b/include/base64.h
index 2bc585fd8f6..667e3d9de13 100644
--- a/include/base64.h
+++ b/include/base64.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/cfg.h b/include/cfg.h
index 16e907cccda..09272f17a4f 100644
--- a/include/cfg.h
+++ b/include/cfg.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/common.h b/include/common.h
index 0b6b01c4c50..03e6099bc56 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/comms.h b/include/comms.h
index 52745b05772..f7b1880e5d8 100644
--- a/include/comms.h
+++ b/include/comms.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -20,13 +20,7 @@
 #ifndef ZABBIX_COMMS_H
 #define ZABBIX_COMMS_H
 
-#ifdef _WINDOWS
-#	if defined(__INT_MAX__) && __INT_MAX__ == 2147483647
-typedef int	ssize_t;
-#	else
-typedef long	ssize_t;
-#	endif
-#endif
+#include "zbxtypes.h"
 
 #ifdef _WINDOWS
 #	define ZBX_TCP_WRITE(s, b, bl)		((ssize_t)send((s), (b), (int)(bl), 0))
diff --git a/include/daemon.h b/include/daemon.h
index 8477098fe4a..78dfb9cdc10 100644
--- a/include/daemon.h
+++ b/include/daemon.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/db.h b/include/db.h
index b4a73b223b9..e8fcd18e4dd 100644
--- a/include/db.h
+++ b/include/db.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -642,7 +642,7 @@ int	DBlock_ids(const char *table_name, const char *field_name, zbx_vector_uint64
 #define DBlock_hostid(id)			DBlock_record("hosts", id, NULL, 0)
 #define DBlock_druleid(id)			DBlock_record("drules", id, NULL, 0)
 #define DBlock_dcheckid(dcheckid, druleid)	DBlock_record("dchecks", dcheckid, "druleid", druleid)
-#define DBlock_graph(id)			DBlock_record("graphs", id, NULL, 0)
+#define DBlock_graphid(id)			DBlock_record("graphs", id, NULL, 0)
 #define DBlock_hostids(ids)			DBlock_records("hosts", ids)
 #define DBlock_triggerids(ids)			DBlock_records("triggers", ids)
 #define DBlock_itemids(ids)			DBlock_records("items", ids)
diff --git a/include/dbcache.h b/include/dbcache.h
index e581684a787..8ecc0dcc6a7 100644
--- a/include/dbcache.h
+++ b/include/dbcache.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/dbschema.h b/include/dbschema.h
index fc71dcc1c70..c44f1d93efc 100644
--- a/include/dbschema.h
+++ b/include/dbschema.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/discovery.h b/include/discovery.h
index d7c7e7ffc93..1d8a105c5af 100644
--- a/include/discovery.h
+++ b/include/discovery.h
@@ -1,7 +1,7 @@
 
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/disk.h b/include/disk.h
index 357ce193ec7..9dace978a11 100644
--- a/include/disk.h
+++ b/include/disk.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/export.h b/include/export.h
index aa12bf27944..fd25af737ba 100644
--- a/include/export.h
+++ b/include/export.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/ipc.h b/include/ipc.h
index 060b102f2fd..9ece724b9ee 100644
--- a/include/ipc.h
+++ b/include/ipc.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/log.h b/include/log.h
index 46f47206635..6a779d56217 100644
--- a/include/log.h
+++ b/include/log.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/memalloc.h b/include/memalloc.h
index 7e93f11dedc..c0f11e6238c 100644
--- a/include/memalloc.h
+++ b/include/memalloc.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/module.h b/include/module.h
index fe280d452de..4cf6772157a 100644
--- a/include/module.h
+++ b/include/module.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/mutexs.h b/include/mutexs.h
index 83259ed42e2..b5f856c3b65 100644
--- a/include/mutexs.h
+++ b/include/mutexs.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/perfmon.h b/include/perfmon.h
index e45a706177b..f1795562250 100644
--- a/include/perfmon.h
+++ b/include/perfmon.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/pid.h b/include/pid.h
index 5b5d5c170f9..024fe26b0b5 100644
--- a/include/pid.h
+++ b/include/pid.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/preproc.h b/include/preproc.h
index 7c59b14a2da..9a83845a811 100644
--- a/include/preproc.h
+++ b/include/preproc.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/proxy.h b/include/proxy.h
index 7e4bbce30a5..dc171ad7665 100644
--- a/include/proxy.h
+++ b/include/proxy.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/service.h b/include/service.h
index 68144a95106..5f22e34570b 100644
--- a/include/service.h
+++ b/include/service.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/setproctitle.h b/include/setproctitle.h
index 4ec60fc255c..085a211ef8d 100644
--- a/include/setproctitle.h
+++ b/include/setproctitle.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/sighandler.h b/include/sighandler.h
index 7adcc7b4a6c..2f1c82ef538 100644
--- a/include/sighandler.h
+++ b/include/sighandler.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/symbols.h b/include/symbols.h
index 600e825c043..af37ccc2c1d 100644
--- a/include/symbols.h
+++ b/include/symbols.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/sysinc.h b/include/sysinc.h
index a0beb02c0a3..36c3f633661 100644
--- a/include/sysinc.h
+++ b/include/sysinc.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/sysinfo.h b/include/sysinfo.h
index 9d8fc404fbd..6a1fcdaedcb 100644
--- a/include/sysinfo.h
+++ b/include/sysinfo.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/telnet.h b/include/telnet.h
index 5e00932d37a..0e05bb160b4 100644
--- a/include/telnet.h
+++ b/include/telnet.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/threads.h b/include/threads.h
index 304cca93ecd..9051102dcba 100644
--- a/include/threads.h
+++ b/include/threads.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/version.h b/include/version.h
index a78a483b8a8..9209725ca84 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxalgo.h b/include/zbxalgo.h
index 374a6e8b511..ede79e9c193 100644
--- a/include/zbxalgo.h
+++ b/include/zbxalgo.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxcompress.h b/include/zbxcompress.h
index d77618d9762..ae4e9171566 100644
--- a/include/zbxcompress.h
+++ b/include/zbxcompress.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxcrypto.h b/include/zbxcrypto.h
index 1916e7b83ad..f84896ec2c8 100644
--- a/include/zbxcrypto.h
+++ b/include/zbxcrypto.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxdb.h b/include/zbxdb.h
index 5dcffa32d04..75bcea030d1 100644
--- a/include/zbxdb.h
+++ b/include/zbxdb.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxdbupgrade.h b/include/zbxdbupgrade.h
index db73093c7d8..5a66bc8c3c0 100644
--- a/include/zbxdbupgrade.h
+++ b/include/zbxdbupgrade.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxembed.h b/include/zbxembed.h
index 918be61427d..eab469aeee7 100644
--- a/include/zbxembed.h
+++ b/include/zbxembed.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxexec.h b/include/zbxexec.h
index 6511ee63382..f0fdd9ed982 100644
--- a/include/zbxexec.h
+++ b/include/zbxexec.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxhistory.h b/include/zbxhistory.h
index 2e398931714..09f2ef5cb7c 100644
--- a/include/zbxhistory.h
+++ b/include/zbxhistory.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxhttp.h b/include/zbxhttp.h
index 03e1a373c95..ff4041e24a7 100644
--- a/include/zbxhttp.h
+++ b/include/zbxhttp.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxicmpping.h b/include/zbxicmpping.h
index 75a9c4dda9e..385990c3bbf 100644
--- a/include/zbxicmpping.h
+++ b/include/zbxicmpping.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxipcservice.h b/include/zbxipcservice.h
index eb0201edff7..600de651f5d 100644
--- a/include/zbxipcservice.h
+++ b/include/zbxipcservice.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxjson.h b/include/zbxjson.h
index 957dd3b692f..1ab6bb02b5a 100644
--- a/include/zbxjson.h
+++ b/include/zbxjson.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxlld.h b/include/zbxlld.h
index d9306ab9f93..d7016bfd730 100644
--- a/include/zbxlld.h
+++ b/include/zbxlld.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2018 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxmedia.h b/include/zbxmedia.h
index 227d2a571c4..d0f92f3933d 100644
--- a/include/zbxmedia.h
+++ b/include/zbxmedia.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxmodules.h b/include/zbxmodules.h
index dc965f7c4a9..f81ff1e7e6c 100644
--- a/include/zbxmodules.h
+++ b/include/zbxmodules.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxnix.h b/include/zbxnix.h
index 1df3ca6e94b..f91542d6e22 100644
--- a/include/zbxnix.h
+++ b/include/zbxnix.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxprometheus.h b/include/zbxprometheus.h
index 06b6cdb99a5..f9a3f92572a 100644
--- a/include/zbxprometheus.h
+++ b/include/zbxprometheus.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxregexp.h b/include/zbxregexp.h
index 14c12dbf5a0..f849fc8ab8c 100644
--- a/include/zbxregexp.h
+++ b/include/zbxregexp.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxself.h b/include/zbxself.h
index 78d1d1b6f65..be6465845c2 100644
--- a/include/zbxself.h
+++ b/include/zbxself.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxserialize.h b/include/zbxserialize.h
index 0a746d808b7..81a3a6db0c0 100644
--- a/include/zbxserialize.h
+++ b/include/zbxserialize.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxserver.h b/include/zbxserver.h
index 00874380ae4..477f6344f8e 100644
--- a/include/zbxserver.h
+++ b/include/zbxserver.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxtasks.h b/include/zbxtasks.h
index 40693f8ab88..18500c31896 100644
--- a/include/zbxtasks.h
+++ b/include/zbxtasks.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/include/zbxtypes.h b/include/zbxtypes.h
index e4d39f5d412..cc014f90407 100644
--- a/include/zbxtypes.h
+++ b/include/zbxtypes.h
@@ -1,6 +1,6 @@
 /*
 ** Zabbix
-** Copyright (C) 2001-2019 Zabbix SIA
+** Copyright (C) 2001-2020 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -80,6 +80,12 @@ typedef uint32_t		zbx_uint32_t;
 typedef __int64	zbx_offset_t;
 #	define zbx_lseek(fd, offset, whence)	_lseeki64(fd, (zbx_offset_t)(offset), whence)
 
+#	if defined(__INT_MAX__) && __INT_MAX__ == 2147483647
+typedef int	ssize_t;
+#	else
+typedef long	ssize_t;
+#	endif
+
 #else	/* _WINDOWS */
 #	define zbx_stat(path, buf)		stat(path, buf)
 #	define zbx_fstat(fd, buf)		fstat(fd, buf)