main window: Prefer the user specified device in new sessions

[pulseview.git] / pv / storesession.cpp

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 8b638de8246da898b8212ee4d1c841781524e990..cb643682d57023462e38cc8dbd228bcd2182a353 100644 (file)
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -19,22 +19,16 @@
 
 #include <cassert>
 
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-
 #include "storesession.hpp"
 
-#include <pv/devicemanager.hpp>
-#include <pv/session.hpp>
 #include <pv/data/analog.hpp>
 #include <pv/data/analogsegment.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
 #include <pv/data/signalbase.hpp>
+#include <pv/devicemanager.hpp>
 #include <pv/devices/device.hpp>
+#include <pv/session.hpp>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
@@ -295,4 +289,4 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
        output_stream_.close();
 }
 
-} // pv
+}  // namespace pv