android: Add missing libintl.so to APK.

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index 8f1860dc466b4622a5fc4e9e35891b445e5947a5..d71b1d6cec3f267bab7044b52dd69d375a1987a3 100644 (file)
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_SIGSESSION_H
-#define PULSEVIEW_PV_SIGSESSION_H
+#ifndef PULSEVIEW_PV_SIGSESSION_HPP
+#define PULSEVIEW_PV_SIGSESSION_HPP
 
 #include <map>
 #include <memory>
@@ -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>
@@ -192,4 +197,4 @@ Q_SIGNALS:
 
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SIGSESSION_H
+#endif // PULSEVIEW_PV_SIGSESSION_HPP