X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=49784bd7ae40630f3f5b3ccc4e125a9f228053e4;hb=b8f1cdeba7cf6c2b749ff60102ce4e260fa1309e;hp=4a5e396c2e08e685d81205caa642608d3be73a13;hpb=c063290ac7189bdd15221450f598504f43286b43;p=pulseview.git diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp index 4a5e396..49784bd 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 @@ -250,5 +244,5 @@ void Channels::disable_all_channels() set_all_channels(false); } -} // popups -} // pv +} // namespace popups +} // namespace pv