aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2012-08-15 17:02:59 +0200
committerHolger Hans Peter Freyther <zecke@selfish.org>2012-08-15 17:08:21 +0200
commit08b286277b1d1c16ce3a615c5de07cefcbd6acf6 (patch)
treeaeb26f698f356f82a6047b213fd737ba36286a2f /include
parent335aedabf204ac025a79801c15c8488d35cc9981 (diff)
utils: Change semantic of OSMO_MAX/OSMO_MIN to match semantic of a function
Add parentheses around the OSMO_MAX and OSMO_MIN macro to match the behaviour of calling a function. The current version does not evaluate to what is expected. (OSMO_MAX(3, 2) + 13) currently results in 3 and not 16.
Diffstat (limited to 'include')
-rw-r--r--include/osmocom/core/utils.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h
index 78cf1863..03861d78 100644
--- a/include/osmocom/core/utils.h
+++ b/include/osmocom/core/utils.h
@@ -10,9 +10,9 @@
/*! \brief Determine number of elements in an array of static size */
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
/*! \brief Return the maximum of two specified values */
-#define OSMO_MAX(a, b) (a) >= (b) ? (a) : (b)
+#define OSMO_MAX(a, b) ((a) >= (b) ? (a) : (b))
/*! \brief Return the minimum of two specified values */
-#define OSMO_MIN(a, b) (a) >= (b) ? (b) : (a)
+#define OSMO_MIN(a, b) ((a) >= (b) ? (b) : (a))
#include <stdint.h>