mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-12-26 00:19:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master'

Browse Source
This commit is contained in:
David Capello 2015-12-09 11:29:50 -03:00
commit f3c171ddbe
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/log.cpp
View File

@ -68,6 +68,7 @@ void verbose_log(const char* format, ...)
fflush(app::log_fileptr);
#ifdef _DEBUG
va_start(ap, format);
vfprintf(stderr, format, ap);
fflush(stderr);
#endif

13
src/base/fs_unix.h
View File

@ -16,6 +16,8 @@
#if __APPLE__
#include <mach-o/dyld.h>
#elif __FreeBSD__
#include <sys/sysctl.h>
#endif
#include "base/path.h"
@ -120,15 +122,16 @@ std::string get_app_path()
std::vector<char> path(MAXPATHLEN);
#if __APPLE__
uint32_t size = path.size();
while (_NSGetExecutablePath(&path[0], &size) == -1)
path.resize(size);
#else
#elif __FreeBSD__
size_t size = path.size();
const int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
while (sysctl(mib, 4, &path[0], &size, NULL, 0) == -1)
path.resize(size);
#else /* linux */
readlink("/proc/self/exe", &path[0], path.size());
#endif
return std::string(&path[0]);