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

Incomplete support for Z (size_t) logiclib integer tests and other minor fixes

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6713 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2016-03-07 14:34:21 +00:00
parent ebc900f4bb
commit d74c5acdcd
5 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Contrib/NSISdl/httpget.cpp
View file

@ -243,12 +243,12 @@ static int my_strnicmp(char *b1, const char *b2, int l)
return 0;
}
char *_strstr(char *i, const char *s)
char *_strstr(const char *i, const char *s)
{
if (strlen(i)>=strlen(s)) while (i[strlen(s)-1])
{
int l=strlen(s)+1;
char *ii=i;
const char *ii=i;
const char *is=s;
while (--l>0)
{
@ -256,7 +256,7 @@ char *_strstr(char *i, const char *s)
ii++;
is++;
}
if (l==0) return i;
if (l==0) return const_cast<char*>(i);
i++;
}
return NULL;

2
Contrib/NSISdl/nsisdl.cpp
View file

@ -226,7 +226,7 @@ void progress_callback(const char *msg, __int64 read_bytes)
}
}
extern char *_strstr(char *i, const char *s);
extern char *_strstr(const char *i, const char *s);
#define strstr _strstr
extern "C"