diff options
author | Darren Tucker <dtucker@dtucker.net> | 2020-01-26 15:09:15 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2020-01-26 15:09:15 +1100 |
commit | 0d1144769151edf65f74aee9a4c8545c37861695 (patch) | |
tree | b27585bea6cfa281e798498c678dffc22475afc3 /defines.h | |
parent | f73ab8a811bc874c2fb403012aa8e4bfdcaf5ec7 (diff) |
Move definition of UINT32_MAX.
This allows us to always define it if needed not just if we also
define the type ourself.
Diffstat (limited to 'defines.h')
-rw-r--r-- | defines.h | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -244,9 +244,6 @@ typedef unsigned short int u_int16_t; | |||
244 | # endif | 244 | # endif |
245 | # if (SIZEOF_INT == 4) | 245 | # if (SIZEOF_INT == 4) |
246 | typedef unsigned int u_int32_t; | 246 | typedef unsigned int u_int32_t; |
247 | # if defined(HAVE_DECL_UINT32_MAX) && (HAVE_DECL_UINT32_MAX == 0) | ||
248 | # define UINT32_MAX UINT_MAX | ||
249 | # endif | ||
250 | # else | 247 | # else |
251 | # error "32 bit int type not found." | 248 | # error "32 bit int type not found." |
252 | # endif | 249 | # endif |
@@ -254,6 +251,12 @@ typedef unsigned int u_int32_t; | |||
254 | #define __BIT_TYPES_DEFINED__ | 251 | #define __BIT_TYPES_DEFINED__ |
255 | #endif | 252 | #endif |
256 | 253 | ||
254 | #if defined(HAVE_DECL_UINT32_MAX) && (HAVE_DECL_UINT32_MAX == 0) | ||
255 | # if (SIZEOF_INT == 4) | ||
256 | # define UINT32_MAX UINT_MAX | ||
257 | # endif | ||
258 | #endif | ||
259 | |||
257 | /* 64-bit types */ | 260 | /* 64-bit types */ |
258 | #ifndef HAVE_INT64_T | 261 | #ifndef HAVE_INT64_T |
259 | # if (SIZEOF_LONG_INT == 8) | 262 | # if (SIZEOF_LONG_INT == 8) |