diff --git a/wait.h b/wait.h
index 83b4012d..fee768d2 100644
--- a/wait.h
+++ b/wait.h
@@ -34,7 +34,7 @@
 
 // http://connect.microsoft.com/VisualStudio/feedback/details/1581706
 //   and http://github.com/weidai11/cryptopp/issues/214
-#if CRYPTOPP_MSC_VERSION == 1900
+#if (CRYPTOPP_MSC_VERSION >= 1900) && (CRYPTOPP_MSC_VERSION < 2000)
 # pragma warning(push)
 # pragma warning(disable: 4589)
 #endif
@@ -226,7 +226,7 @@ private:
 
 NAMESPACE_END
 
-#if CRYPTOPP_MSC_VERSION == 1900
+#if (CRYPTOPP_MSC_VERSION >= 1900) && (CRYPTOPP_MSC_VERSION < 2000)
 # pragma warning(pop)
 #endif