diff --git a/lib/cmock_generator.rb b/lib/cmock_generator.rb
index 592e979..d4fe404 100644
--- a/lib/cmock_generator.rb
+++ b/lib/cmock_generator.rb
@@ -103,7 +103,9 @@ class CMockGenerator
     file << "\n"
     file << "/* Ignore the following warnings, since we are copying code */\n"
     file << "#if defined(__GNUC__) && !defined(__ICC) && !defined(__TMS470__)\n"
+    file << "#if __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 6 || (__GNUC_MINOR__ == 6 && __GNUC_PATCHLEVEL__ > 0)))\n"
     file << "#pragma GCC diagnostic push\n"
+    file << "#endif\n"
     file << "#if !defined(__clang__)\n"
     file << "#pragma GCC diagnostic ignored \"-Wpragmas\"\n"
     file << "#endif\n"
@@ -128,8 +130,10 @@ class CMockGenerator
   def create_mock_header_footer(header)
     header << "\n"
     header << "#if defined(__GNUC__) && !defined(__ICC) && !defined(__TMS470__)\n"
+    header << "#if __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 6 || (__GNUC_MINOR__ == 6 && __GNUC_PATCHLEVEL__ > 0)))\n"
     header << "#pragma GCC diagnostic pop\n"
     header << "#endif\n"
+    header << "#endif\n"
     header << "\n"
     header << "#endif\n"
   end