Initial modularization with both Clang and VC hacks

Note: gave up on VC about half way though.

1 files changed, 22 insertions, 5 deletions

diff --git a/tests/process/driver.cxx b/tests/process/driver.cxx
index 0338af2..01f2c30 100644
--- a/tests/process/driver.cxx
+++ b/tests/process/driver.cxx
@@ -4,17 +4,34 @@
 
 #include <stdlib.h> // getenv(), setenv(), _putenv()
 
+#include <cassert>
+
+#ifndef __cpp_lib_modules
 #include <ios>
 #include <string>
 #include <vector>
-#include <cassert>
-#include <iostream>
 #include <iterator>  // istreambuf_iterator, ostream_iterator
 #include <algorithm> // copy()
+#include <iostream>
+#endif
+
+// Other includes.
 
-#include <libbutl/path.hxx>
-#include <libbutl/process.hxx>
-#include <libbutl/fdstream.hxx>
+#ifdef __cpp_modules
+#ifdef __cpp_lib_modules
+import std.core;
+import std.io;
+#endif
+import butl.path;
+import butl.process;
+import butl.optional;
+import butl.fdstream;
+#else
+#include <libbutl/path.mxx>
+#include <libbutl/process.mxx>
+#include <libbutl/optional.mxx>
+#include <libbutl/fdstream.mxx>
+#endif
 
 using namespace std;
 using namespace butl;