From 75e97857e0c57a245904ef809dac08b5379be904 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Sat, 14 Nov 2020 18:18:45 -0500 Subject: [PATCH] Only define MIN macro if not defined; WolfSSL defines it --- src/{komodo_utils.h => hush_utils.h} | 2 ++ 1 file changed, 2 insertions(+) rename src/{komodo_utils.h => hush_utils.h} (99%) diff --git a/src/komodo_utils.h b/src/hush_utils.h similarity index 99% rename from src/komodo_utils.h rename to src/hush_utils.h index a57df01de..e9db7ddae 100644 --- a/src/komodo_utils.h +++ b/src/hush_utils.h @@ -108,7 +108,9 @@ struct rmd160_vstate { uint64_t length; uint8_t buf[64]; uint32_t curlen, state[ #define Sigma1(x) (S(x, 6) ^ S(x, 11) ^ S(x, 25)) #define Gamma0(x) (S(x, 7) ^ S(x, 18) ^ R(x, 3)) #define Gamma1(x) (S(x, 17) ^ S(x, 19) ^ R(x, 10)) +#ifndef MIN #define MIN(x, y) ( ((x)<(y))?(x):(y) ) +#endif static inline int32_t sha256_vcompress(struct sha256_vstate * md,uint8_t *buf) {