Trace: Removed coloured_bg state

[pulseview.git] / pv / session.cpp

diff --git a/pv/session.cpp b/pv/session.cpp
index f65b05a1588cad8ea001d31fdcdd3df7e6e94eca..31ca328deca53bf1c9cfd90d426fb228da228af6 100644 (file)
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -17,12 +17,6 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-
 #include <QFileInfo>
 
 #include <cassert>
@@ -31,16 +25,16 @@
 
 #include <sys/stat.h>
 
-#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"
@@ -1035,7 +1029,7 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 void Session::data_feed_in(shared_ptr<sigrok::Device> device,
        shared_ptr<Packet> packet)
 {
-       static bool frame_began=false;
+       static bool frame_began = false;
 
        (void)device;