Windows.h is included by boost/thread, hence the conflict can be avoided by defining NOGDI and NORESOURCE before including the thread library. It is probably also possible to define these macros in some top-level file, but I'm not sure if it's safe enough.
-- Vladislav Ivanov --- pv/session.hpp | 5 +++++ pv/view/rowitemiterator.hpp | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pv/session.hpp b/pv/session.hpp index 0f904d0..7dcab06 100644 --- a/pv/session.hpp +++ b/pv/session.hpp @@ -29,6 +29,11 @@ #include <thread> #include <vector> +#ifdef _WIN32 +#define NOGDI +#define NORESOURCE +#endif + #include <boost/thread.hpp> #include <QObject> diff --git a/pv/view/rowitemiterator.hpp b/pv/view/rowitemiterator.hpp index c45507b..ecc657a 100644 --- a/pv/view/rowitemiterator.hpp +++ b/pv/view/rowitemiterator.hpp @@ -29,6 +29,11 @@ #include <type_traits> #include <vector> +#ifdef _WIN32 +#define NOGDI +#define NORESOURCE +#endif + #include <boost/thread.hpp> #include <pv/session.hpp> -- 1.9.1 ------------------------------------------------------------------------------ Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ sigrok-devel mailing list sigrok-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/sigrok-devel
