From: Vladislav Ivanov <vlad-mbx@ya.ru>
Date: Thu, 26 Feb 2015 18:29:59 +0000 (+0300)
Subject: win32: Fix the Windows build (namespace pollution via windows.h).
X-Git-Url: http://git.code-monkey.de/?a=commitdiff_plain;h=627ffe3f3a5d0a8f38e35668bd4ed71321f09b91;hp=627ffe3f3a5d0a8f38e35668bd4ed71321f09b91;p=pulseview.git

win32: Fix the Windows build (namespace pollution via windows.h).

One of the multiple build errors:

  In file included from [...]/windows.h:72:0,
                   from [...]/boost/detail/interlocked.hpp:27,
                   from [...]/boost/thread/win32/thread_primitives.hpp:18,
                   from [...]/boost/thread/win32/thread_data.hpp:11,
                   from [...]/boost/thread/thread_only.hpp:15,
                   from [...]/boost/thread/thread.hpp:12,
                   from [...]/boost/thread.hpp:13,
                   from [...]/pulseview/pv/session.hpp:32,
                   from [...]/pulseview/pv/devicemanager.cpp:22:
  [...]/libsigrok/enums.hpp:153:32: error: expected unqualified-id before numeric constant
    static const Quantity * const DIFFERENCE;
                                  ^

windows.h is included by boost/thread.hpp, hence the conflict can be avoided
by defining NOGDI and NORESOURCE before including thread.hpp.

This fixes bug #517.
---