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

Merged patch #252: Build failure on Mac OS X - conversion error in Source/util.cpp

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6513 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-07-05 00:11:17 +00:00
parent 83cc78d77b
commit 41fd62105e
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/util.cpp
View file

@ -672,11 +672,11 @@ tstring get_executable_path(const TCHAR* argv0) {
assert(rc != 0); assert(rc != 0);
return tstring(temp_buf); return tstring(temp_buf);
#elif __APPLE__ #elif __APPLE__
TCHAR temp_buf[MAXPATHLEN+1]; char temp_buf[MAXPATHLEN+1];
unsigned int buf_len = MAXPATHLEN; unsigned int buf_len = MAXPATHLEN;
int rc = Apple::_NSGetExecutablePath(temp_buf, &buf_len); int rc = Apple::_NSGetExecutablePath(temp_buf, &buf_len);
assert(rc == 0); assert(rc == 0);
return tstring(temp_buf); return tstring(CtoTString(temp_buf));
#else /* Linux/BSD/POSIX/etc */ #else /* Linux/BSD/POSIX/etc */
const TCHAR *envpath = _tgetenv(_T("_")); const TCHAR *envpath = _tgetenv(_T("_"));
if( envpath != NULL ) if( envpath != NULL )