dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merged from PIEPIEPIE branch:

Browse source 
- min/max macros removed
- Plugins refactored
- more functions in util.{h,cpp}


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4232 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
oripel 2005-08-27 19:56:00 +00:00
parent b33965c87d
commit 57ad3c18b3
12 changed files with 300 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/clzma.cpp
View file

@ -1,3 +1,4 @@
#include <algorithm> // for std::min
#include "clzma.h"
#ifndef _WIN32
@ -342,7 +343,7 @@ HRESULT CLZMA::ReadPart(void *data, UINT32 size, UINT32 *processedSize)
if (compressor_finished)
return E_ABORT;
}
UINT32 l = min(size, avail_in);
UINT32 l = std::min(size, avail_in);
memcpy(data, next_in, l);
avail_in -= l;
size -= l;
@ -371,7 +372,7 @@ HRESULT CLZMA::WritePart(const void *data, UINT32 size, UINT32 *processedSize)
if (!avail_out)
return E_ABORT;
}
UINT32 l = min(size, avail_out);
UINT32 l = std::min(size, avail_out);
memcpy(next_out, data, l);
avail_out -= l;
size -= l;