win32: Re-fix the Windows build (namespace pollution via windows.h).

This brings back / extends fixes for bug #517.

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>
 
 
 #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>
 
 #include <boost/thread/locks.hpp>
 #include <boost/thread/shared_mutex.hpp>
 

diff --git a/pv/session.cpp b/pv/session.cpp
index 4130096830a80944c7ab8d27a583289ab3cfefb8..e6fb52fd7dd0d589342ed877ee573cbb572a4755 100644 (file)
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -18,6 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 

+#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>
 
 #include <boost/thread/locks.hpp>
 #include <boost/thread/shared_mutex.hpp>
 

diff --git a/pv/session.hpp b/pv/session.hpp
index 0828edbbf912cb3d8e09e18db94102df872ca1e1..2eb4f630fd3be357161272f3b1ae60028390ce1b 100644 (file)
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -31,7 +31,7 @@
 #include <vector>
 
 #ifdef _WIN32
 #include <vector>
 
 #ifdef _WIN32

-// Windows: Avoid namespace pollution by thread.hpp (which includes windows.h).
+// Windows: Avoid boost/thread namespace pollution (which includes windows.h).

 #define NOGDI
 #define NORESOURCE
 #endif
 #define NOGDI
 #define NORESOURCE
 #endif

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index da2f963be9eb99609786800e9c45ad3ece294040..c7c2edb0b4eace1e1fcf290770527b35ac6d12fb 100644 (file)
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -20,6 +20,11 @@
 
 #include <cassert>
 
 
 #include <cassert>
 

+#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>
 
 #include <boost/thread/locks.hpp>
 #include <boost/thread/shared_mutex.hpp>