projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Remove unused arguments from 'format_time()'
[pulseview.git]
/
pv
/
view
/
rowitemiterator.hpp
diff --git
a/pv/view/rowitemiterator.hpp
b/pv/view/rowitemiterator.hpp
index c45507bbb3de46a2545ead04b2d33df1e0d01e4c..1b8926ca90a0d35a2df9c20b6d44cf0165f57393 100644
(file)
--- a/
pv/view/rowitemiterator.hpp
+++ b/
pv/view/rowitemiterator.hpp
@@
-29,6
+29,11
@@
#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/session.hpp>