Cleaned up the Process class.

diff --git a/lib/base/process-unix.cpp b/lib/base/process-unix.cpp
index 17eb7e8f8ffd736efbe4db4ab75e7f63cd3fd7b9..f2ad37914f8f6fd639f230d46a0620e81fc1745e 100644 (file)
--- a/lib/base/process-unix.cpp
+++ b/lib/base/process-unix.cpp
@@ -19,10 +19,7 @@
 
 #ifndef _WIN32
 #include "i2-base.h"
-
-#ifndef _MSC_VER
 #include <execvpe.h>
-#endif /* _MSC_VER */
 
 using namespace icinga;
 

diff --git a/lib/base/process-windows.cpp b/lib/base/process-windows.cpp
index 954644b71c220885fca32f13309c5c10104f2ee7..d6db2df03b587af0dd0620a723d1cc15f3f69aca 100644 (file)
--- a/lib/base/process-windows.cpp
+++ b/lib/base/process-windows.cpp
@@ -20,10 +20,6 @@
 #ifdef _WIN32
 #include "i2-base.h"
 
-#ifndef _MSC_VER
-#include <execvpe.h>
-#endif /* _MSC_VER */
-
 using namespace icinga;
 
 void Process::CreateWorkers(void)

diff --git a/lib/base/process.cpp b/lib/base/process.cpp
index 3ac71fb53bcee528ac96f77497dd26e571ce7cfb..f49a05cfb66afd0baafd47ce7a18ef99c1c4e322 100644 (file)
--- a/lib/base/process.cpp
+++ b/lib/base/process.cpp
@@ -19,10 +19,6 @@
 
 #include "i2-base.h"
 
-#ifndef _MSC_VER
-#include <execvpe.h>
-#endif /* _MSC_VER */
-
 using namespace icinga;
 
 bool Process::m_WorkersCreated = false;
@@ -42,7 +38,7 @@ Process::Process(const vector<String>& arguments, const Dictionary::Ptr& extraEn
 
 #ifndef _WIN32
        m_FD = -1;
-#endif /* _MSC_VER */
+#endif /* _WIN32 */
 }
 
 vector<String> Process::ParseCommand(const String& command)