diff options
| author | rubidium <rubidium@openttd.org> | 2007-11-10 23:22:32 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-11-10 23:22:32 +0000 |
| commit | 0c3364e2413faa330a8231e219036012209d52fe (patch) | |
| tree | 5e4d0b5e5272e5d1efc8c372b810eb49f2d600cd | |
| parent | dd4720461b4de89004921fc838652ee488da2ca4 (diff) | |
| download | openttd-0c3364e2413faa330a8231e219036012209d52fe.tar.xz | |
(svn r11401) -Fix [FS#1391]: make all min functions do exactly the same instead of branching on either < or <=.
| -rw-r--r-- | src/macros.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/macros.h b/src/macros.h index 004e4039d..95af44123 100644 --- a/src/macros.h +++ b/src/macros.h @@ -120,7 +120,7 @@ template<typename T> static inline T min(const T a, const T b) */ static inline int min(const int a, const int b) { - return a <= b ? a : b; + return a < b ? a : b; } /** @@ -134,7 +134,7 @@ static inline int min(const int a, const int b) */ static inline uint minu(const uint a, const uint b) { - return a <= b ? a : b; + return a < b ? a : b; } /** |