summaryrefslogtreecommitdiff
path: root/src/utils/process.cpp
diff options
context:
space:
mode:
authorSocapex <philippe_groarke@yahoo.ca>2012-12-29 14:52:48 -0500
committerSocapex <philippe_groarke@yahoo.ca>2012-12-29 14:52:48 -0500
commitda44874127b07449e9c53f19179b99d300384a8b (patch)
tree55930f76cebd79e379f9c85dee211a4549accbb7 /src/utils/process.cpp
parent58414be5bf4d1fad092f61851ef106be89b1f81d (diff)
downloadManaVerse-da44874127b07449e9c53f19179b99d300384a8b.tar.gz
ManaVerse-da44874127b07449e9c53f19179b99d300384a8b.tar.bz2
ManaVerse-da44874127b07449e9c53f19179b99d300384a8b.tar.xz
ManaVerse-da44874127b07449e9c53f19179b99d300384a8b.zip
OS X now compiles with process.cpp
Diffstat (limited to 'src/utils/process.cpp')
-rw-r--r--src/utils/process.cpp21
1 files changed, 2 insertions, 19 deletions
diff --git a/src/utils/process.cpp b/src/utils/process.cpp
index 8e238b4cc..f284cc7e1 100644
--- a/src/utils/process.cpp
+++ b/src/utils/process.cpp
@@ -102,29 +102,12 @@ bool openBrowser(std::string url)
nullptr, SW_SHOWNORMAL) > 32;
}
-#elif defined(__APPLE__)
-int execFileWait(std::string pathName, std::string name,
- std::string arg1, std::string arg2, int waitTime)
-{
- return -1;
-}
-
-bool execFile(std::string pathName, std::string name,
- std::string arg1, std::string arg2)
-{
- return false;
-}
-
-bool openBrowser(std::string url)
-{
- return false;
-}
-
-#elif defined __linux__ || defined __linux
+#elif defined __linux__ || defined __linux || defined __APPLE__
#include <sys/types.h>
#include <sys/wait.h>
+#include <signal.h>
int execFileWait(std::string pathName, std::string name,
std::string arg1, std::string arg2, int waitTime)