aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-05-22 04:56:48 +0100
committerJoão Valverde <j@v6e.pt>2016-05-22 04:56:34 +0000
commit7a23f422da609a1f291ae9e57d1e53a3b764b9fb (patch)
treeaab5461fe986ef5511c6f947c5859f6c334b18d7
parent20c284c96bdc2aa1fdfebc76246cf78d8480f813 (diff)
Make -Wunused-const-variable a C only warning
Change-Id: If93de2c371f36fa0447fb8215337f0c115d74bbb Reviewed-on: https://code.wireshark.org/review/15524 Reviewed-by: João Valverde <j@v6e.pt>
-rw-r--r--CMakeLists.txt2
-rw-r--r--configure.ac3
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65419b7954..2532503016 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -366,7 +366,6 @@ else()
-Wno-overlength-strings
-Wno-long-long
-Wheader-guard
- -Wunused-const-variable
)
set(WIRESHARK_C_ONLY_FLAGS
@@ -379,6 +378,7 @@ else()
-Wstrict-prototypes
-Wlogical-op
-Wjump-misses-init
+ -Wunused-const-variable
# The Qt headers generate a ton of shortening errors on 64-bit systems
# so only enable this for C for now.
-Wshorten-64-to-32
diff --git a/configure.ac b/configure.ac
index 8123c355b4..7ce954fc3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -580,12 +580,13 @@ AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wpragmas)
AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wno-overlength-strings)
AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wno-long-long)
AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wheader-guard)
-AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wunused-const-variable)
+
#
# The following are C only, not C++
#
AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wc++-compat, C)
AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wdeclaration-after-statement, C)
+AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wunused-const-variable, C)
#
# XXX - OK for C++?