X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=31ca328deca53bf1c9cfd90d426fb228da228af6;hb=894c4b52fe140cf30a839cf3c7583fea04602683;hp=d00ff97a0bbe78ae7a9e55a82e2913b36c602807;hpb=c063290ac7189bdd15221450f598504f43286b43;p=pulseview.git diff --git a/pv/session.cpp b/pv/session.cpp index d00ff97..31ca328 100644 --- a/pv/session.cpp +++ b/pv/session.cpp @@ -17,12 +17,6 @@ * along with this program; if not, see . */ -#ifdef _WIN32 -// Windows: Avoid boost/thread namespace pollution (which includes windows.h). -#define NOGDI -#define NORESOURCE -#endif - #include #include @@ -31,16 +25,16 @@ #include -#include "session.hpp" #include "devicemanager.hpp" +#include "session.hpp" #include "data/analog.hpp" #include "data/analogsegment.hpp" +#include "data/decode/decoder.hpp" #include "data/decoderstack.hpp" #include "data/logic.hpp" #include "data/logicsegment.hpp" #include "data/signalbase.hpp" -#include "data/decode/decoder.hpp" #include "devices/hardwaredevice.hpp" #include "devices/inputfile.hpp"