From: Uwe Hermann <redacted>
Date: Wed, 16 Sep 2020 18:51:54 +0000 (+0200)
Subject: pv/exprtk.hpp: Fix Windows build issues.
X-Git-Url: https://sigrok.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=4788af1e3e48461cc60d1fc035e5de64e914c03d;p=pulseview.git

pv/exprtk.hpp: Fix Windows build issues.

Define NOGDI and NORESOURCE in order to avoid unneeded namespace
pollution caused by <windows.h>, which leads to errors such as:

  libsigrokcxx/enums.hpp:374:36: error: expected unqualified-id before numeric constant
    static const QuantityFlag * const RELATIVE;
                                      ^

  libsigrokcxx/enums.hpp:161:32: error: expected unqualified-id before numeric constant
    static const Quantity * const DIFFERENCE;
                                  ^
---

diff --git a/pv/exprtk.hpp b/pv/exprtk.hpp
index ca383758..d1f6cf15 100644
--- a/pv/exprtk.hpp
+++ b/pv/exprtk.hpp
@@ -37114,6 +37114,8 @@ namespace exprtk
 #   ifndef WIN32_LEAN_AND_MEAN
 #      define WIN32_LEAN_AND_MEAN
 #   endif
+#   define NOGDI
+#   define NORESOURCE
 #   include <windows.h>
 #   include <ctime>
 #else