summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/math_func.hpp6
-rw-r--r--src/stdafx.h15
2 files changed, 12 insertions, 9 deletions
diff --git a/src/core/math_func.hpp b/src/core/math_func.hpp
index 63f21fd28..35aeeee1e 100644
--- a/src/core/math_func.hpp
+++ b/src/core/math_func.hpp
@@ -163,8 +163,8 @@ static inline uint ClampU(const uint a, const uint min, const uint max)
*/
static inline int32 ClampToI32(const int64 a)
{
- if (a <= (int32)0x80000000) return 0x80000000;
- if (a >= (int32)0x7FFFFFFF) return 0x7FFFFFFF;
+ if (a <= INT32_MIN) return INT32_MIN;
+ if (a >= INT32_MAX) return INT32_MAX;
return (int32)a;
}
@@ -177,7 +177,7 @@ static inline int32 ClampToI32(const int64 a)
*/
static inline uint16 ClampToU16(const uint64 a)
{
- return (uint16)(a <= 0xFFFFU ? a : 0xFFFFU);
+ return (uint16)(a <= UINT16_MAX ? a : UINT16_MAX);
}
/**
diff --git a/src/stdafx.h b/src/stdafx.h
index 80b2592ad..76818d93f 100644
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -32,12 +32,15 @@
#include <stdint.h>
#endif
#else
- #define INT64_MAX (9223372036854775807LL)
- #define INT64_MIN (-INT64_MAX - 1)
- #define INT32_MAX (2147483647)
- #define INT32_MIN (-INT32_MAX - 1)
- #define INT16_MAX (32767)
- #define INT16_MIN (-INT16_MAX - 1)
+ #define UINT64_MAX (18446744073709551615ULL)
+ #define INT64_MAX (9223372036854775807LL)
+ #define INT64_MIN (-INT64_MAX - 1)
+ #define UINT32_MAX (4294967295U)
+ #define INT32_MAX (2147483647)
+ #define INT32_MIN (-INT32_MAX - 1)
+ #define UINT16_MAX (65535U)
+ #define INT16_MAX (32767)
+ #define INT16_MIN (-INT16_MAX - 1)
#endif
#include <cstdio>