fixed build errors and warnings caused by latest merge

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

View file

@ -7,6 +7,8 @@
#include "Platform.h"
using namespace std;
GrowBuf::GrowBuf() { m_alloc=m_used=m_zero=0; m_s=NULL; m_bs=32768; }
GrowBuf::~GrowBuf() { free(m_s); }
@ -51,7 +53,7 @@ void GrowBuf::resize(int newlen)
}
quit();
}
memcpy(n,m_s,std::min(newlen,os));
memcpy(n,m_s,min(newlen,os));
free(m_s);
}
m_s=n;