From 054b3e68881a1e74469c176e578b03e060a8c926 Mon Sep 17 00:00:00 2001
From: John Bytheway <jbytheway@gmail.com>
Date: Wed, 19 Feb 2020 21:49:39 -0500
Subject: [PATCH] Enable a few more gcc warning options

---
 CMakeLists.txt | 4 ++++
 Makefile       | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59fe250ecda99..c67c08024c545 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -221,14 +221,18 @@ IF(MSVC)
 ELSE()
     SET(CATA_WARNINGS
       "-Werror -Wall -Wextra \
+       -Wformat-signedness \
        -Wlogical-op \
        -Wmissing-declarations \
        -Wmissing-noreturn \
        -Wold-style-cast \
        -Woverloaded-virtual \
        -Wpedantic \
+       -Wredundant-decls \
        -Wrestrict \
        -Wsuggest-override \
+       -Wunused-macros \
+       -Wzero-as-null-pointer-constant \
        -Wno-unknown-warning-option")
     # Compact the whitespace in the warning string
     string(REGEX REPLACE "[\t ]+" " " CATA_WARNINGS "${CATA_WARNINGS}")
diff --git a/Makefile b/Makefile
index a68ff1d04953c..8040db98917a2 100644
--- a/Makefile
+++ b/Makefile
@@ -89,14 +89,18 @@
 RELEASE_FLAGS =
 WARNINGS = \
   -Werror -Wall -Wextra \
+  -Wformat-signedness \
   -Wlogical-op \
   -Wmissing-declarations \
   -Wmissing-noreturn \
   -Wold-style-cast \
   -Woverloaded-virtual \
   -Wpedantic \
+  -Wredundant-decls \
   -Wrestrict \
   -Wsuggest-override \
+  -Wunused-macros \
+  -Wzero-as-null-pointer-constant \
   -Wno-unknown-warning-option
 # Uncomment below to disable warnings
 #WARNINGS = -w