Merge pull request #3220 from cgzones/compiler_warnings

[Minor] Fix some compiler warnings

cmake/CompilerWarnings.cmake

@@ -1,5 +1,5 @@
 CHECK_C_COMPILER_FLAG(-Wall SUPPORT_WALL)
-CHECK_C_COMPILER_FLAG(-W SUPPORT_W)
+CHECK_C_COMPILER_FLAG(-Wextra SUPPORT_WEXTRA)
 CHECK_C_COMPILER_FLAG(-Wpointer-arith SUPPORT_WPOINTER)
 CHECK_C_COMPILER_FLAG(-Wno-unused-parameter SUPPORT_WPARAM)
 CHECK_C_COMPILER_FLAG(-Wno-unused-function SUPPORT_WFUNCTION)
@@ -16,9 +16,9 @@ CHECK_C_COMPILER_FLAG(-Wduplicated-cond SUPPORT_WDUPLICATED_COND)
 # GCC 7 specific
 CHECK_C_COMPILER_FLAG(-Wimplicit-fallthrough SUPPORT_WIMPLICIT_FALLTHROUGH)
 
-IF(SUPPORT_W)
-    ADD_COMPILE_OPTIONS("-W")
-ENDIF(SUPPORT_W)
+IF(SUPPORT_WEXTRA)
+    ADD_COMPILE_OPTIONS("-Wextra")
+ENDIF(SUPPORT_WEXTRA)
 IF(SUPPORT_WALL)
     ADD_COMPILE_OPTIONS("-Wall")
 ENDIF(SUPPORT_WALL)
@@ -35,10 +35,12 @@ IF(SUPPORT_WUNUSED_VAR)
     ADD_COMPILE_OPTIONS("-Wunused-variable")
 ENDIF(SUPPORT_WUNUSED_VAR)
 IF(SUPPORT_WPOINTER_SIGN)
-    ADD_COMPILE_OPTIONS("-Wno-pointer-sign")
+    # only valid for C
+    ADD_COMPILE_OPTIONS($<$<COMPILE_LANGUAGE:C>:-Wno-pointer-sign>)
 ENDIF(SUPPORT_WPOINTER_SIGN)
 IF(SUPPORT_WSTRICT_PROTOTYPES)
-    ADD_COMPILE_OPTIONS("-Wstrict-prototypes")
+    # only valid for C
+    ADD_COMPILE_OPTIONS($<$<COMPILE_LANGUAGE:C>:-Wstrict-prototypes>)
 ENDIF(SUPPORT_WSTRICT_PROTOTYPES)
 IF(SUPPORT_WSTRICT_ALIASING)
     ADD_COMPILE_OPTIONS("-Wno-strict-aliasing")
@@ -69,4 +71,4 @@ ENDIF(SUPPORT_WIMPLICIT_FALLTHROUGH)
 CHECK_C_COMPILER_FLAG(-fPIC SUPPORT_FPIC)
 IF(SUPPORT_FPIC)
     ADD_COMPILE_OPTIONS("-fPIC")
-ENDIF(SUPPORT_FPIC)
+ENDIF(SUPPORT_FPIC)

contrib/lua-lpeg/lptypes.h

@@ -11,7 +11,7 @@
 
 #include "config.h"
 
-#if !defined(LPEG_DEBUG)
+#if !defined(LPEG_DEBUG) && !defined(NDEBUG)
 #define NDEBUG
 #endif
 

contrib/snowball/compiler/analyser.c

@@ -207,8 +207,7 @@ static void check_name_type(struct analyser * a, struct name * p, int type) {
         case 'i': if (p->type == t_integer) return; break;
         case 'b': if (p->type == t_boolean) return; break;
         case 'R': if (p->type == t_grouping) return;
-        case 'r': if (p->type == t_routine ||
-                      p->type == t_external) return; break;
+        case 'r': if (p->type == t_routine || p->type == t_external) return; break;
         case 'g': if (p->type == t_grouping) return; break;
     }
     error2(a, 33, type);
@@ -856,9 +855,9 @@ extern void read_program(struct analyser * a) {
         until (q == 0) {
             switch(q->type) {
                 case t_external: case t_routine:
-                    if (q->used && q->definition == 0) error4(a, q); break;
+                    if (q->used && q->definition == 0) { error4(a, q); } break;
                 case t_grouping:
-                    if (q->used && q->grouping == 0) error4(a, q); break;
+                    if (q->used && q->grouping == 0) { error4(a, q); } break;
             }
             q = q->next;
         }