Commit 4578df0e authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

Merge branch 'aggraef/purr-data-mojave-fixes1'

parents e2b3cc4a 6f8b4805
Pipeline #1583 failed with stage
in 0 seconds
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#include "XmlRpcValue.h" #include "XmlRpcValue.h"
#include "XmlRpcException.h" #include "XmlRpcException.h"
#include "XmlRpcUtil.h" #include "XmlRpcUtil.h"
#include "base64.h"
#ifndef MAKEDEPEND #ifndef MAKEDEPEND
# include <iostream> # include <iostream>
...@@ -11,6 +10,8 @@ ...@@ -11,6 +10,8 @@
# include <stdio.h> # include <stdio.h>
#endif #endif
#include "base64.h"
namespace XmlRpc { namespace XmlRpc {
......
...@@ -848,9 +848,10 @@ t_symbol *pd_getdirname(void) ...@@ -848,9 +848,10 @@ t_symbol *pd_getdirname(void)
buf[len] = '\0'; buf[len] = '\0';
sys_unbashfilename(buf, buf); sys_unbashfilename(buf, buf);
#elif defined(__APPLE__) #elif defined(__APPLE__)
len = sizeof(buf); int ret;
_NSGetExecutablePath(buf, &len); len = sizeof(buf); buf[0] = '\0';
if (len != -1) buf[len] = '\0'; ret = _NSGetExecutablePath(buf, &len);
if (ret) len = -1;
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
len = (ssize_t)(readlink("/proc/curproc/file", buf, sizeof(buf)-1)); len = (ssize_t)(readlink("/proc/curproc/file", buf, sizeof(buf)-1));
if (len != -1) buf[len] = '\0'; if (len != -1) buf[len] = '\0';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment