diff --git a/include/gsl/multi_span b/include/gsl/multi_span
index 3a2d982..779f6e9 100644
--- a/include/gsl/multi_span
+++ b/include/gsl/multi_span
@@ -57,7 +57,7 @@
 #endif // _MSC_VER < 1910
 #endif // _MSC_VER
 
-#if __clang__ || __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
@@ -2266,7 +2266,7 @@ general_span_iterator<Span> operator+(typename general_span_iterator<Span>::diff
 #pragma GCC diagnostic pop
 #endif // __GNUC__ > 6
 
-#if __clang__ || __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/tests/multi_span_tests.cpp b/tests/multi_span_tests.cpp
index d9a0e20..32dbf94 100644
--- a/tests/multi_span_tests.cpp
+++ b/tests/multi_span_tests.cpp
@@ -1043,7 +1043,7 @@ TEST(multi_span_test, subspan)
         EXPECT_TRUE(av.subspan(4).length() == 1);
         EXPECT_TRUE(av.subspan(5).length() == 0);
         // Disabled test instead of fixing since multi_span is deprecated. (PR#835)
-#if !(defined(__GNUC__) && __GNUC__ == 8 && __GNUC_MINOR__ == 3)
+#if !(defined(__GNUC__) && __GNUC__ == 8)
         EXPECT_DEATH(av.subspan(6).length(), deathstring);
 #endif
         auto av2 = av.subspan(1);