projects/aports·blob master · refs

29 lines · 615 B

1This fixes compilation on 32 bit systems where `size_t min(size_t, size_t)`
2and `uint32_t min(uint32_t, uint32_t)` is the same signature.
3
4--- a/TheForceEngine/TFE_Jedi/Math/core_math.h
5+++ b/TheForceEngine/TFE_Jedi/Math/core_math.h
6@@ -6,6 +6,9 @@
7 #include <TFE_System/types.h>
8 #include "fixedPoint.h"
9 #include "cosTable.h"
10+#include <climits>
11+#include <cstddef>
12+#include <cstdint>
13
14 namespace TFE_Jedi
15 {
16@@ -337,6 +340,7 @@
17 return x - (x >> 1);
18 }
19
20+#if SIZE_MAX != UINT32_MAX
21 // Size_t
22 inline size_t min(size_t a, size_t b)
23 {
24@@ -352,4 +356,5 @@
25 {
26 return min(max(x, a), b);
27 }
28+#endif
29 }