[icinga-checkins] icinga.org: icinga2/master: Cleaned up the Process class.

git at icinga.org git at icinga.org
Wed Feb 13 12:18:49 CET 2013


Module: icinga2
Branch: master
Commit: d2650df8b65e0b809cc30de0975ff3f876b00640
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=d2650df8b65e0b809cc30de0975ff3f876b00640

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Wed Feb 13 11:48:19 2013 +0100

Cleaned up the Process class.

---

 lib/base/process-unix.cpp    |    3 ---
 lib/base/process-windows.cpp |    4 ----
 lib/base/process.cpp         |    6 +-----
 3 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/lib/base/process-unix.cpp b/lib/base/process-unix.cpp
index 17eb7e8..f2ad379 100644
--- 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 954644b..d6db2df 100644
--- 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 3ac71fb..f49a05c 100644
--- 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)





More information about the icinga-checkins mailing list