New CMake procedure with conflict detection.

[tools/libbatch.git] / src / Core / Utils.cxx

diff --git a/src/Core/Utils.cxx b/src/Core/Utils.cxx
index 7098a4b743a53addb5f338f5716361ebc117e568..5af9021659d6190231306519c938ac6416769548 100644 (file)
--- a/src/Core/Utils.cxx
+++ b/src/Core/Utils.cxx
@@ -30,25 +30,22 @@
 #include <cstdio>
 #include <iostream>
 #include <fstream>
+#include <time.h>
 
 #ifdef WIN32
-#include <Windows.h>
-#include <time.h>
-#include <io.h>
+#  include <Windows.h>
+#  include <io.h>
+#  define popen _popen
+#  define pclose _pclose
 #else
-#include <sys/stat.h>
-#include <unistd.h>
+#  include <sys/stat.h>
+#  include <unistd.h>
 #endif
 
-#include <config.h>
+#include <libbatch_config.h>
 #include "Utils.hxx"
 #include "RunTimeException.hxx"
 
-#ifdef MSVC
-#define popen _popen
-#define pclose _pclose
-#endif
-
 using namespace std;
 namespace Batch {