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

fixed build errors and warnings caused by latest merge

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4233 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-08-30 16:30:48 +00:00
parent 57ad3c18b3
commit 8424e074e9
5 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/clzma.cpp
View file

@ -1,6 +1,8 @@
#include <algorithm> // for std::min
#include "clzma.h"
using namespace std;
#ifndef _WIN32
struct evnet_t
{
@ -343,7 +345,7 @@ HRESULT CLZMA::ReadPart(void *data, UINT32 size, UINT32 *processedSize)
if (compressor_finished)
return E_ABORT;
}
UINT32 l = std::min(size, avail_in);
UINT32 l = min(size, avail_in);
memcpy(data, next_in, l);
avail_in -= l;
size -= l;
@ -372,7 +374,7 @@ HRESULT CLZMA::WritePart(const void *data, UINT32 size, UINT32 *processedSize)
if (!avail_out)
return E_ABORT;
}
UINT32 l = std::min(size, avail_out);
UINT32 l = min(size, avail_out);
memcpy(next_out, data, l);
avail_out -= l;
size -= l;