From 08b286277b1d1c16ce3a615c5de07cefcbd6acf6 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 15 Aug 2012 17:02:59 +0200 Subject: 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. --- include/osmocom/core/utils.h | 4 ++-- 1 file 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 -- cgit v1.2.3