diff options
| author | Glebs Ivanovskis <git-no-reply@zabbix.com> | 2016-03-29 10:27:17 +0300 |
|---|---|---|
| committer | Glebs Ivanovskis <git-no-reply@zabbix.com> | 2016-03-29 10:27:17 +0300 |
| commit | 7cab1d3330b9cbfdafe9513a2fc95b729462aaf9 (patch) | |
| tree | 96d3cca072c57a3d890809aef499c54fae729552 /include/zbxtypes.h | |
| parent | 447301afba6318163a7842910765fd949cc6115b (diff) | |
...G...PS. [ZBX-10375] fixed zbx_uint32_t double definition, improved is_uint_n_range() calls
Diffstat (limited to 'include/zbxtypes.h')
| -rw-r--r-- | include/zbxtypes.h | 10 |
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 |