Mercurial > dropbear
diff libtommath/tommath_private.h @ 1511:5916af64acd4 fuzz
merge from main
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Sat, 17 Feb 2018 19:29:51 +0800 |
parents | 8bba51a55704 |
children | f52919ffd3b1 |
line wrap: on
line diff
--- a/libtommath/tommath_private.h Tue Jan 23 23:27:40 2018 +0800 +++ b/libtommath/tommath_private.h Sat Feb 17 19:29:51 2018 +0800 @@ -18,9 +18,13 @@ #include <tommath.h> #include <ctype.h> -#define MIN(x,y) (((x) < (y)) ? (x) : (y)) +#ifndef MIN + #define MIN(x,y) (((x) < (y)) ? (x) : (y)) +#endif -#define MAX(x,y) (((x) > (y)) ? (x) : (y)) +#ifndef MAX + #define MAX(x,y) (((x) > (y)) ? (x) : (y)) +#endif #ifdef __cplusplus extern "C" { @@ -114,6 +118,6 @@ #endif -/* $Source$ */ -/* $Revision$ */ -/* $Date$ */ +/* ref: $Format:%D$ */ +/* git commit: $Format:%H$ */ +/* commit time: $Format:%ai$ */