X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=bffd0dfefbb15e6182b6c4ed54ee5ae9ac3dbd27;hp=ea5f5fbed8d10c91c61dc1d39cca1826030ab81b;hb=35750e4dc619d538f105ed024f3a72b630108234;hpb=475f4d08f3099a949dbac5f8b64cda36957ed103

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index ea5f5fbe..bffd0dfe 100644
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -20,6 +20,11 @@
 
 #include <map>
 
+#ifdef _WIN32
+// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
+#define NOGDI
+#define NORESOURCE
+#endif
 #include <boost/thread/locks.hpp>
 #include <boost/thread/shared_mutex.hpp>