Revert "Try to please both GCC (the compiler, not me) and clang."

Unfortunately it prevents compilation with GCC. I'll just use "cmake -DDISABLE_WERROR=ON" on the affected machine for now.

This reverts commit cdaad860720a17d889e759d9e263c5fcadaf36a2.

Change-Id: I54c0e7882e42dd39b81c90c761e4aaec6d757bd1
Reviewed-on: https://code.wireshark.org/review/8297
Reviewed-by: Gerald Combs <gerald@wireshark.org>

2 files changed, 0 insertions, 14 deletions

diff --git a/epan/wslua/lrexlib_algo.h b/epan/wslua/lrexlib_algo.h
index 350a7f838a..1578bb268f 100644
--- a/epan/wslua/lrexlib_algo.h
+++ b/epan/wslua/lrexlib_algo.h
@@ -31,8 +31,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "lrexlib.h"
 
-#include <wsutil/ws_diag_control.h>
-
 #ifdef LREXLIB_WIRESHARK
 #  define WSLUA_TYPEOF_FIELD "__typeof"
 #  define REX_CREATEGLOBALVAR
@@ -279,7 +277,6 @@ static void push_substrings (lua_State *L, TUserdata *ud, const char *text,
   }
 }
 
-DIAG_OFF(parentheses-equality)
 static int algf_gsub (lua_State *L) {
   TUserdata *ud;
   TArgComp argC;
@@ -462,10 +459,8 @@ static int algf_gsub (lua_State *L) {
   freelist_free (&freelist);
   return 3;
 }
-DIAG_ON(parentheses-equality)
 
 
-DIAG_OFF(parentheses-equality)
 static int finish_generic_find (lua_State *L, TUserdata *ud, TArgExec *argE,
   int method, int res)
 {
@@ -485,7 +480,6 @@ static int finish_generic_find (lua_State *L, TUserdata *ud, TArgExec *argE,
   else
     return generate_error (L, ud, res);
 }
-DIAG_ON(parentheses-equality)
 
 
 static int generic_find_func (lua_State *L, int method) {
@@ -518,7 +512,6 @@ static int algf_match (lua_State *L) {
 }
 
 
-DIAG_OFF(parentheses-equality)
 static int gmatch_iter (lua_State *L) {
   int retry;
   TArgExec argE;
@@ -579,10 +572,8 @@ static int gmatch_iter (lua_State *L) {
       return generate_error (L, ud, res);
   }
 }
-DIAG_ON(parentheses-equality)
 
 
-DIAG_OFF(parentheses-equality)
 static int split_iter (lua_State *L) {
   int incr, newoffset, res;
   TArgExec argE;
@@ -628,7 +619,6 @@ nomatch:
   lua_pushlstring (L, argE.text+argE.startoffset, argE.textlen-argE.startoffset);
   return 1;
 }
-DIAG_ON(parentheses-equality)
 
 
 static int algf_gmatch (lua_State *L)
@@ -704,7 +694,6 @@ static void push_offset_table (lua_State *L, TUserdata *ud, int startoffset) {
 }
 
 
-DIAG_OFF(parentheses-equality)
 static int generic_find_method (lua_State *L, int method) {
   TUserdata *ud;
   TArgExec argE;
@@ -738,7 +727,6 @@ static int generic_find_method (lua_State *L, int method) {
   else
     return generate_error(L, ud, res);
 }
-DIAG_ON(parentheses-equality)
 
 
 static int algm_find (lua_State *L) {
diff --git a/epan/wslua/lrexlib_glib.c b/epan/wslua/lrexlib_glib.c
index 91043410ab..fd24c28a5c 100644
--- a/epan/wslua/lrexlib_glib.c
+++ b/epan/wslua/lrexlib_glib.c
@@ -276,7 +276,6 @@ static void checkarg_dfa_exec (lua_State *L, TArgExec *argE, TGrgx **ud) {
   argE->eflags = ALG_GETEFLAGS (L, 4);
 }
 
-DIAG_OFF(parentheses-equality)
 /* unlike PCRE, partial matching won't return the actual substrings/matches */
 static int Gregex_dfa_exec (lua_State *L)
 {
@@ -320,7 +319,6 @@ static int Gregex_dfa_exec (lua_State *L)
       return generate_error (L, ud, 0);
   }
 }
-DIAG_ON(parentheses-equality)
 
 #ifdef ALG_USERETRY
   static int gmatch_exec (TUserdata *ud, TArgExec *argE, int retry) {