projects
/
ecpprog.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix warning about MIN being redeclared
[ecpprog.git]
/
ecpprog
/
jtag_tap.c
diff --git
a/ecpprog/jtag_tap.c
b/ecpprog/jtag_tap.c
index ac636ab554ea0b4735356fccd176553a3872fea4..538d675bca676383ff337e368defa691c3552e79 100644
(file)
--- 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,