Index: source/lib/sysdep/os/unix/unix_executable_pathname.cpp =================================================================== --- source/lib/sysdep/os/unix/unix_executable_pathname.cpp +++ source/lib/sysdep/os/unix/unix_executable_pathname.cpp @@ -24,18 +24,17 @@ #include "lib/sysdep/sysdep.h" -#define GNU_SOURCE -#include "mocks/dlfcn.h" -#include "mocks/unistd.h" - +#define _GNU_SOURCE +#include #include +#include OsPath unix_ExecutablePathname() { // Find the executable's filename Dl_info dl_info; memset(&dl_info, 0, sizeof(dl_info)); - if (!T::dladdr((void *)sys_ExecutablePathname, &dl_info) || !dl_info.dli_fname) + if (!dladdr((void *)sys_ExecutablePathname, &dl_info) || !dl_info.dli_fname) return OsPath(); const char* path = dl_info.dli_fname; @@ -53,7 +52,7 @@ if (strchr(path, '/')) { char cwd[PATH_MAX]; - if (!T::getcwd(cwd, PATH_MAX)) + if (!getcwd(cwd, PATH_MAX)) return OsPath(); char absolute[PATH_MAX];