projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
win32: Fix the Windows build (namespace pollution via windows.h).
[pulseview.git]
/
pv
/
session.hpp
diff --git
a/pv/session.hpp
b/pv/session.hpp
index 0f904d0d1cf300cf406b75d4751b46a5b3ed67a5..d71b1d6cec3f267bab7044b52dd69d375a1987a3 100644
(file)
--- a/
pv/session.hpp
+++ b/
pv/session.hpp
@@
-29,6
+29,11
@@
#include <thread>
#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 <QObject>