From 4b210a839a427d3aeb465a97bc7707a2f409bcbb Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Sun, 24 Jan 2016 14:43:55 +0200
Subject: [PATCH 1/3] Fixed uninitialized variable in IOKit controller handler

---
 src/posix/cocoa/i_joystick.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/posix/cocoa/i_joystick.cpp b/src/posix/cocoa/i_joystick.cpp
index 9b9487cf6..c4bcc85c3 100644
--- a/src/posix/cocoa/i_joystick.cpp
+++ b/src/posix/cocoa/i_joystick.cpp
@@ -157,8 +157,9 @@ private:
 		IOHIDElementCookie cookie;
 		int32_t            value;
 
-		DigitalButton(const IOHIDElementCookie cookie)
+		explicit DigitalButton(const IOHIDElementCookie cookie)
 		: cookie(cookie)
+		, value(0)
 		{ }
 	};
 

From 1721d70212f9543985569bd06690409b6b51d1dc Mon Sep 17 00:00:00 2001
From: Chris <chris@localhost>
Date: Sun, 24 Jan 2016 14:44:47 +0000
Subject: [PATCH 2/3] - Removed duplicate autoskip code.

---
 src/wi_stuff.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/wi_stuff.cpp b/src/wi_stuff.cpp
index e931b33fd..09861086b 100644
--- a/src/wi_stuff.cpp
+++ b/src/wi_stuff.cpp
@@ -1096,6 +1096,11 @@ void WI_End ()
 	}
 }
 
+bool WI_autoSkip()
+{
+	return wi_autoadvance > 0 && bcnt > (wi_autoadvance * TICRATE);
+}
+
 void WI_initNoState ()
 {
 	state = NoState;
@@ -1114,7 +1119,7 @@ void WI_updateNoState ()
 	else
 	{
 		bool noauto = noautostartmap;
-		bool autoskip = (wi_autoadvance > 0 && bcnt > (wi_autoadvance * TICRATE));
+		bool autoskip = WI_autoSkip();
 
 		for (int i = 0; !noauto && i < MAXPLAYERS; ++i)
 		{
@@ -1254,7 +1259,7 @@ void WI_updateDeathmatchStats ()
 
 	int i;
 	bool stillticking;
-	bool autoskip = (wi_autoadvance > 0 && bcnt > (wi_autoadvance * TICRATE));
+	bool autoskip = WI_autoSkip();
 
 	WI_updateAnimatedBack();
 
@@ -1506,7 +1511,7 @@ void WI_updateNetgameStats ()
 	int i;
 	int fsum;
 	bool stillticking;
-	bool autoskip = (wi_autoadvance > 0 && bcnt > (wi_autoadvance * TICRATE));
+	bool autoskip = WI_autoSkip();
 
 	WI_updateAnimatedBack ();
 

From 4d225e7a009454cc97e48db2118b0485ded577f3 Mon Sep 17 00:00:00 2001
From: Braden Obrzut <admin@maniacsvault.net>
Date: Sun, 24 Jan 2016 23:03:59 -0500
Subject: [PATCH 3/3] - Fixed: Mac GCC errors due to not recognizing the newly
 disabled warnings.

---
 dumb/CMakeLists.txt | 5 ++++-
 src/CMakeLists.txt  | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dumb/CMakeLists.txt b/dumb/CMakeLists.txt
index fd8cdd968..7b303297c 100644
--- a/dumb/CMakeLists.txt
+++ b/dumb/CMakeLists.txt
@@ -8,7 +8,10 @@ include( CheckCXXCompilerFlag )
 set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DDEBUGMODE=1" )
 
 if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
-	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-pointer-sign -Wno-uninitialized -Wno-unused-but-set-variable" )
+	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-pointer-sign -Wno-uninitialized" )
+	if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.5")
+		set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-but-set-variable" )
+	endif(NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.5")
 endif( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
 
 CHECK_FUNCTION_EXISTS( itoa ITOA_EXISTS )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 40503f8e9..6de8feabc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -459,8 +459,12 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
 	set( CMAKE_CXX_FLAGS_MINSIZEREL "${REL_CXX_FLAGS} ${CMAKE_CXX_FLAGS_MINSIZEREL}" )
 	set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${REL_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}" )
 
-	set( CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-result ${CMAKE_C_FLAGS}" )
-	set( CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-result ${CMAKE_CXX_FLAGS}" )
+	if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.5")
+                set( CMAKE_C_FLAGS "-Wno-unused-result ${CMAKE_C_FLAGS}" )
+		set( CMAKE_CXX_FLAGS "-Wno-unused-result ${CMAKE_CXX_FLAGS}" )
+        endif(NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.5")
+	set( CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-missing-field-initializers ${CMAKE_C_FLAGS}" )
+	set( CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-missing-field-initializers ${CMAKE_CXX_FLAGS}" )
 
 	# Remove extra warnings when using the official DirectX headers.
 	# Also, TDM-GCC 4.4.0 no longer accepts glibc-style printf formats as valid,