From 871d93dc76091a273296e9a0a7ce3d411054c862 Mon Sep 17 00:00:00 2001
From: linuxdaemon
Date: Mon, 24 Jun 2019 06:00:39 -0500
Subject: Reset diagnostic pragmas after including external headers (#1661).

---
 src/modules/m_httpd.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/modules/m_httpd.cpp')

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index c4b5dc1f2..b768789f1 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -28,6 +28,10 @@
 #include "iohook.h"
 #include "modules/httpd.h"
 
+#ifdef __GNUC__
+# pragma GCC diagnostic push
+#endif
+
 // Fix warnings about the use of commas at end of enumerator lists and long long
 // on C++03.
 #if defined __clang__
@@ -44,11 +48,15 @@
 
 // Fix warnings about shadowing in http_parser.
 #ifdef __GNUC__
-//# pragma GCC diagnostic ignored "-Wshadow"
+# pragma GCC diagnostic ignored "-Wshadow"
 #endif
 
 #include <http_parser.c>
 
+#ifdef __GNUC__
+# pragma GCC diagnostic pop
+#endif
+
 class ModuleHttpServer;
 
 static ModuleHttpServer* HttpModule;
-- 
cgit v1.3.1-10-gc9f91