projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Add a mechanism to make ViewItem classes immovable.
[pulseview.git]
/
pv
/
popups
/
channels.cpp
diff --git
a/pv/popups/channels.cpp
b/pv/popups/channels.cpp
index ea5f5fbed8d10c91c61dc1d39cca1826030ab81b..bffd0dfefbb15e6182b6c4ed54ee5ae9ac3dbd27 100644
(file)
--- 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>