From: Greg Davill Date: Sat, 4 Dec 2021 05:53:49 +0000 (+1030) Subject: Fix warning about MIN being redeclared X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=15b7243b12645b34221af6527096659902479604;p=ecpprog.git Fix warning about MIN being redeclared --- diff --git a/ecpprog/jtag_tap.c b/ecpprog/jtag_tap.c index ac636ab..538d675 100644 --- a/ecpprog/jtag_tap.c +++ b/ecpprog/jtag_tap.c @@ -213,8 +213,9 @@ static void jtag_shift_bytes( memcpy(output_data, data, byte_count); } - -#define MIN(a,b) ((a) < (b)) ? (a) : (b) +#ifndef MIN + #define MIN(a,b) ((a) < (b)) ? (a) : (b) +#endif void jtag_tap_shift( uint8_t *input_data,