changeset 35775 | 440e8fce29e7 |
parent 34635 | 3455e2e2ce9b |
child 36618 | 9a639a33ad1f |
--- a/mercurial/cext/util.h Sun Jan 21 14:47:45 2018 +0800 +++ b/mercurial/cext/util.h Sun Jan 21 15:39:48 2018 +0100 @@ -27,7 +27,9 @@ extern PyTypeObject dirstateTupleType; #define dirstate_tuple_check(op) (Py_TYPE(op) == &dirstateTupleType) +#ifndef MIN #define MIN(a, b) (((a) < (b)) ? (a) : (b)) +#endif /* VC9 doesn't include bool and lacks stdbool.h based on my searching */ #if defined(_MSC_VER) || __STDC_VERSION__ < 199901L #define true 1