diff --git a/include/cpptrace/cpptrace.hpp b/include/cpptrace/cpptrace.hpp
index c0be82d..b35bed1 100644
--- a/include/cpptrace/cpptrace.hpp
+++ b/include/cpptrace/cpptrace.hpp
@@ -27,7 +27,7 @@
  #define CPPTRACE_FORCE_NO_INLINE __attribute__((noinline))
 #endif
 
-#if _MSC_VER
+#ifdef _MSC_VER
 #pragma warning(push)
 // warning C4251: using non-dll-exported type in dll-exported type, firing on std::vector<frame_ptr> and others for some
 // reason
@@ -406,7 +406,7 @@ namespace cpptrace {
         } catch(...) { \
             ::cpptrace::rethrow_and_wrap_if_needed(); \
         } \
-    } while(0);
+    } while(0)
 
 #define CPPTRACE_WRAP(expression) [&] () -> decltype((expression)) { \
         try { \
@@ -416,7 +416,7 @@ namespace cpptrace {
         } \
     } ()
 
-#if _MSC_VER
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif