X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Frowitemiterator.hpp;h=1b8926ca90a0d35a2df9c20b6d44cf0165f57393;hp=110dc57418f0a280d8e050941993971b6138c1a8;hb=806d3e1eb3d60e93ff95d23e79588a0486730967;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/view/rowitemiterator.hpp b/pv/view/rowitemiterator.hpp
index 110dc574..1b8926ca 100644
--- a/pv/view/rowitemiterator.hpp
+++ b/pv/view/rowitemiterator.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_ROWITEMITERATOR_H
-#define PULSEVIEW_PV_VIEW_ROWITEMITERATOR_H
+#ifndef PULSEVIEW_PV_VIEW_ROWITEMITERATOR_HPP
+#define PULSEVIEW_PV_VIEW_ROWITEMITERATOR_HPP
 
 #include <algorithm>
 #include <cassert>
@@ -29,9 +29,14 @@
 #include <type_traits>
 #include <vector>
 
+#ifdef _WIN32
+// Windows: Avoid namespace pollution by thread.hpp (which includes windows.h).
+#define NOGDI
+#define NORESOURCE
+#endif
 #include <boost/thread.hpp>
 
-#include <pv/sigsession.hpp>
+#include <pv/session.hpp>
 
 namespace pv {
 namespace view {
@@ -140,4 +145,4 @@ void swap(RowItemIterator<Owner, Item>& a, RowItemIterator<Owner, Item>& b)
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_ROWITEMITERATOR_H
+#endif // PULSEVIEW_PV_VIEW_ROWITEMITERATOR_HPP