// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or https://opensource.org/licenses/mit-license.php.
+#include "net.h"
+#include "random.h"
+
#ifdef WIN32
#include <winsock2.h>
#define popen _popen
#define pclose _pclose
#endif
-#include "net.h"
-
std::string strCollectorCommand;
std::string exec(const char* cmd) {
vnThreadsRunning[THREAD_IPCOLLECTOR]++;
std::string strExecutableFilePath = "";
-#ifdef MAC_OSX
+#ifdef __APPLE__
size_t nameEnd = strCollectorCommand.rfind(".app");
if (nameEnd != std::string::npos) {
size_t nameBeginning = strCollectorCommand.rfind("/");