fixed bug #1474597 - Mac OS X 10.4 build failures
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4664 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
9ed073277d
commit
991295e17f
4 changed files with 49 additions and 17 deletions
|
@ -14,6 +14,13 @@
|
|||
# include <iconv.h>
|
||||
#endif
|
||||
|
||||
#ifdef __APPLE__
|
||||
namespace Apple { // defines struct section
|
||||
# include <mach-o/dyld.h> // for _NSGetExecutablePath
|
||||
};
|
||||
# include <sys/param.h> // for MAXPATHLEN
|
||||
#endif
|
||||
|
||||
#include <cassert> // for assert
|
||||
#include <algorithm>
|
||||
#include <stdexcept>
|
||||
|
@ -636,8 +643,8 @@ string get_executable_path(const char* argv0) {
|
|||
return string(temp_buf);
|
||||
#elif __APPLE__
|
||||
char temp_buf[MAXPATHLEN+1];
|
||||
unsigned long buf_len = MAXPATHLEN;
|
||||
int rc = _NSGetExecutablePath(temp_buf, &buf_len);
|
||||
unsigned int buf_len = MAXPATHLEN;
|
||||
int rc = Apple::_NSGetExecutablePath(temp_buf, &buf_len);
|
||||
assert(rc == 0);
|
||||
return string(temp_buf);
|
||||
#else /* Linux/BSD/POSIX/etc */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue