mirror of
https://github.com/biergaizi/codecrypt
synced 2024-06-27 01:08:15 +00:00
algos_sig: fix min() macro name collision with STL
This commit is contained in:
parent
3deffb0ebe
commit
5333b6e1f8
@ -53,7 +53,7 @@
|
||||
* Then hash it as usual, FMTSeq it, publish the signature, enjoy.
|
||||
*/
|
||||
|
||||
#define min(a,b) ((a)<(b)?(a):(b))
|
||||
#define MIN(a,b) ((a)<(b)?(a):(b))
|
||||
|
||||
static void msg_pad (const bvector&in, std::vector<byte>&out, size_t minsize)
|
||||
{
|
||||
@ -72,7 +72,7 @@ static void msg_pad (const bvector&in, std::vector<byte>&out, size_t minsize)
|
||||
//stuff in as much seed material as possible
|
||||
for (i = 0; i < (out.size() >> 8); ++i) {
|
||||
std::vector<byte> sub (out.begin() + (i << 8),
|
||||
min (out.end(),
|
||||
MIN (out.end(),
|
||||
out.begin() + ( (i + 1) << 8) ) );
|
||||
g.load_key (sub);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user