X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=ca142d68582a433eb0626661a459e8000653a5c6;hb=a3d5a7c7682ebb991718b49ae916c5840b3b6b51;hp=9775998f0422127b56db25d4172b6bb10545c389;hpb=870ea3dbf35b182e120c5d84ab89bf9cb7691232;p=pulseview.git diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp index 9775998f..ca142d68 100644 --- a/pv/popups/channels.cpp +++ b/pv/popups/channels.cpp @@ -19,12 +19,6 @@ #include -#ifdef _WIN32 -// Windows: Avoid boost/thread namespace pollution (which includes windows.h). -#define NOGDI -#define NORESOURCE -#endif - #include #include #include @@ -36,7 +30,7 @@ #include #include #include -#include +#include #include