Make sure nsel_CONFIG_WIN32_LEAN_AND_MEAN and nsel_CONFIG_NO_EXCEPTIO…

…NS_SEH are defined (#69)
martinmoene · Aug 5, 2024 · f339d2f · f339d2f
1 parent 884e1f5
commit f339d2f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/include/nonstd/expected.hpp b/include/nonstd/expected.hpp
@@ -85,6 +85,8 @@
 
 #if !defined(nsel_CONFIG_WIN32_LEAN_AND_MEAN) && defined(_MSC_VER)
 # define nsel_CONFIG_WIN32_LEAN_AND_MEAN  1
+#else
+# define nsel_CONFIG_WIN32_LEAN_AND_MEAN  0
 #endif
 
 // Control presence of C++ exception handling (try and auto discover):
@@ -102,8 +104,10 @@
 
 // at default use SEH with MSVC for no C++ exceptions
 
-#ifndef  nsel_CONFIG_NO_EXCEPTIONS_SEH
-# define nsel_CONFIG_NO_EXCEPTIONS_SEH  ( nsel_CONFIG_NO_EXCEPTIONS && _MSC_VER )
+#if !defined(nsel_CONFIG_NO_EXCEPTIONS_SEH) && defined(_MSC_VER)
+# define nsel_CONFIG_NO_EXCEPTIONS_SEH  nsel_CONFIG_NO_EXCEPTIONS
+#else
+# define nsel_CONFIG_NO_EXCEPTIONS_SEH  0
 #endif
 
 // C++ language version detection (C++23 is speculative):