helpers: Define MIN() We already have MAX() defined, add MIN() to the common helpers header. Using the common helper also fixes a bug in tpmdrivers's MIN() where it was reverted. Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- Changes: v2: * updated the comment about a fixed bug
diff --git a/include/helpers.h b/include/helpers.h index 112184f..898c02c 100644 --- a/include/helpers.h +++ b/include/helpers.h
@@ -53,5 +53,6 @@ #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) #define ROUNDUP(x,v) ((((x) + ((v) - 1)) / (v)) * (v)) #define MAX(x,y) ((x) > (y) ? (x) : (y)) +#define MIN(x,y) ((x) < (y) ? (x) : (y)) #endif
diff --git a/lib/libtpm/tcgbios.c b/lib/libtpm/tcgbios.c index ee052e1..8e80811 100644 --- a/lib/libtpm/tcgbios.c +++ b/lib/libtpm/tcgbios.c
@@ -43,8 +43,6 @@ #define dprintf(_x ...) #endif -#define MIN(a, b) ((a) < (b) ? (a) : (b)) - static struct { unsigned tpm_probed:1; unsigned tpm_found:1;
diff --git a/lib/libtpm/tpm_drivers.c b/lib/libtpm/tpm_drivers.c index 5005176..0e13561 100644 --- a/lib/libtpm/tpm_drivers.c +++ b/lib/libtpm/tpm_drivers.c
@@ -30,8 +30,6 @@ #define dprintf(_x ...) #endif -#define MIN(a, b) ((a) > (b) ? (b) : (a)) - /* layout of the command request queue for vTPM; all fields are big endian */ struct crq { uint8_t valid;