X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=e6fb52fd7dd0d589342ed877ee573cbb572a4755;hp=4130096830a80944c7ab8d27a583289ab3cfefb8;hb=35750e4dc619d538f105ed024f3a72b630108234;hpb=475f4d08f3099a949dbac5f8b64cda36957ed103

diff --git a/pv/session.cpp b/pv/session.cpp
index 4130096..e6fb52f 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -18,6 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#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>