summaryrefslogtreecommitdiffhomepage
path: root/libtommath/tommath_private.h
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2018-02-17 19:29:51 +0800
committerMatt Johnston <matt@ucc.asn.au>2018-02-17 19:29:51 +0800
commit7e8094d53a1c01ac671156ff2e67157b64d01a3a (patch)
treec88345f5bdd118eb9414dff5ab5c307bb1806c57 /libtommath/tommath_private.h
parentf7a664f127d3dfde0e7c7a9ca74b1d14f9a2f983 (diff)
parentf042eb41ab0d31f8ba0c5ccc9c848ad01f08f986 (diff)
merge from main
--HG-- branch : fuzz
Diffstat (limited to 'libtommath/tommath_private.h')
-rw-r--r--libtommath/tommath_private.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/libtommath/tommath_private.h b/libtommath/tommath_private.h
index bc7cd35..aeda684 100644
--- a/libtommath/tommath_private.h
+++ b/libtommath/tommath_private.h
@@ -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 @@ int func_name (mp_int * a, type b) \
#endif
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref: $Format:%D$ */
+/* git commit: $Format:%H$ */
+/* commit time: $Format:%ai$ */