Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'include/zbxtypes.h')
-rw-r--r--include/zbxtypes.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/include/zbxtypes.h b/include/zbxtypes.h
index cd2cb483c4c..38cc3df2549 100644
--- a/include/zbxtypes.h
+++ b/include/zbxtypes.h
@@ -31,8 +31,6 @@
#define ZBX_PTR_SIZE sizeof(void *)
-typedef uint32_t zbx_uint32_t;
-
#if defined(_WINDOWS)
# include <strsafe.h>
@@ -61,7 +59,11 @@ typedef uint32_t zbx_uint32_t;
# define alloca _alloca
-# define zbx_uint32_t __int32
+# ifndef uint32_t
+typedef unsigned __int32 zbx_uint32_t;
+# else
+typedef uint32_t zbx_uint32_t;
+# endif
# ifndef PATH_SEPARATOR
# define PATH_SEPARATOR '\\'
@@ -127,6 +129,8 @@ typedef __int64 zbx_offset_t;
# endif
# endif
+typedef uint32_t zbx_uint32_t;
+
# ifndef PATH_SEPARATOR
# define PATH_SEPARATOR '/'
# endif