exa/codecrypt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

algos_sig: fix min() macro name collision with STL

Browse source
This commit is contained in:
Mirek Kratochvil 2013-09-30 12:00:06 +02:00
parent 3deffb0ebe
commit 5333b6e1f8
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/algos_sig.cpp
View file

@ -53,7 +53,7 @@
* Then hash it as usual, FMTSeq it, publish the signature, enjoy. * 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) 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 //stuff in as much seed material as possible
for (i = 0; i < (out.size() >> 8); ++i) { for (i = 0; i < (out.size() >> 8); ++i) {
std::vector<byte> sub (out.begin() + (i << 8), std::vector<byte> sub (out.begin() + (i << 8),
min (out.end(), MIN (out.end(),
out.begin() + ( (i + 1) << 8) ) ); out.begin() + ( (i + 1) << 8) ) );
g.load_key (sub); g.load_key (sub);
} }