From 824ce5d9e11b800d823703c556732f30eb80a940 Mon Sep 17 00:00:00 2001
From: Volodymyr Shymanskyy <vshymanskyi@gmail.com>
Date: Wed, 9 Dec 2020 21:42:31 +0200
Subject: [PATCH] Fix #184

---
 platforms/cpp/wasm3_cpp/include/wasm3_cpp.h | 1 +
 source/m3_config_platforms.h                | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/platforms/cpp/wasm3_cpp/include/wasm3_cpp.h b/platforms/cpp/wasm3_cpp/include/wasm3_cpp.h
index 6d62fcd..aa03132 100644
--- a/platforms/cpp/wasm3_cpp/include/wasm3_cpp.h
+++ b/platforms/cpp/wasm3_cpp/include/wasm3_cpp.h
@@ -6,6 +6,7 @@
 #include <iostream>
 #include <vector>
 #include <memory>
+#include <string>
 #include <iterator>
 
 #include <m3_api_defs.h>
diff --git a/source/m3_config_platforms.h b/source/m3_config_platforms.h
index fd7b5d2..c47d13f 100644
--- a/source/m3_config_platforms.h
+++ b/source/m3_config_platforms.h
@@ -18,7 +18,7 @@
 #define M3_CONCAT__(a,b) a##b
 #define M3_CONCAT(a,b)   M3_CONCAT__(a,b)
 
-# if !defined(__cplusplus)
+# if !defined(__cplusplus) || defined(_MSC_VER)
 #   define not      !
 #   define and      &&
 #   define or       ||