diff --git a/src/lib/io/CCryptoMode.h b/src/lib/io/CCryptoMode.h
index 29ecaf70..314e7eff 100644
--- a/src/lib/io/CCryptoMode.h
+++ b/src/lib/io/CCryptoMode.h
@@ -20,18 +20,17 @@
 #include "ECryptoMode.h"
 #include "CString.h"
 
-#if SYSAPI_UNIX
+#if __APPLE__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wtautological-compare"
-#pragma GCC diagnostic ignored "-Wunused-variable"
-#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wall"
 #endif 
 
 #include <cryptopp562/gcm.h>
 #include <cryptopp562/modes.h>
 #include <cryptopp562/aes.h>
 
-#if SYSAPI_UNIX
+#if __APPLE__
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/src/lib/io/CCryptoStream.h b/src/lib/io/CCryptoStream.h
index 0515117b..8a8bead9 100644
--- a/src/lib/io/CCryptoStream.h
+++ b/src/lib/io/CCryptoStream.h
@@ -21,7 +21,7 @@
 #include "CStreamFilter.h"
 #include "CCryptoMode.h"
 
-#if SYSAPI_UNIX
+#if __APPLE__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wall"
 #endif
@@ -29,7 +29,7 @@
 #include <cryptopp562/osrng.h>
 #include <cryptopp562/sha.h>
 
-#if SYSAPI_UNIX
+#if __APPLE__
 #pragma GCC diagnostic pop
 #endif