From 9183fed7a93ffba70cebdd9c98b49ca60e68bc91 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@debian.org>
Date: Wed, 28 Jan 2015 14:47:23 -0800
Subject: [PATCH] gcc fixes

---
 arch/linux/ipx_bsd.c | 7 ++++---
 configure.ac         | 2 +-
 include/error.h      | 2 +-
 include/pstypes.h    | 4 ++++
 libmve/decoder16.c   | 5 ++---
 main/multi.c         | 4 ++--
 main/network.c       | 2 +-
 7 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/arch/linux/ipx_bsd.c b/arch/linux/ipx_bsd.c
index a04279df..3852fe9d 100644
--- a/arch/linux/ipx_bsd.c
+++ b/arch/linux/ipx_bsd.c
@@ -43,7 +43,7 @@ static int ipx_bsd_GetMyAddress(void)
 	int sock;
 	struct sockaddr_ipx ipxs;
 	struct sockaddr_ipx ipxs2;
-	int len;
+	socklen_t len;
 	int i;
 
 	sock=socket(AF_IPX,SOCK_DGRAM,PF_IPX);
@@ -87,7 +87,7 @@ static int ipx_bsd_OpenSocket(ipx_socket_t *sk, int port)
 	int sock;           /* sock here means Linux socket handle */
 	int opt;
 	struct sockaddr_ipx ipxs;
-	int len;
+	socklen_t len;
 	struct sockaddr_ipx ipxs2;
 
 	/* DANG_FIXTHIS - kludge to support broken linux IPX stack */
@@ -206,7 +206,8 @@ static int ipx_bsd_SendPacket(ipx_socket_t *mysock, IPXPacket_t *IPXHeader,
 
 static int ipx_bsd_ReceivePacket(ipx_socket_t *s, char *buffer, int bufsize,
 	                             struct ipx_recv_data *rd) {
-	int sz, size;
+	socklen_t sz;
+	int size;
 	struct sockaddr_ipx ipxs;
 
 	sz = sizeof(ipxs);
diff --git a/configure.ac b/configure.ac
index 6086545b..a780280e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,7 @@ test "x$exec_prefix" = "xNONE" && exec_prefix="${prefix}"
 dnl Set default locations to find data files.
 default_sharepath="$datadir/games/$PACKAGE"
 
-CFLAGS="-Wall -Werror -Wno-ignored-attributes -Wno-deprecated-declarations -Wno-int-to-pointer-cast $CFLAGS"
+CFLAGS="-Wall -Werror -Wno-deprecated-declarations -Wno-int-to-pointer-cast -Wno-unused-value -Wno-unused-but-set-variable -Wno-address $CFLAGS"
 
 dnl Enable editor build?
 AC_ARG_ENABLE(editor,
diff --git a/include/error.h b/include/error.h
index 37632f74..0c26a5fd 100644
--- a/include/error.h
+++ b/include/error.h
@@ -46,7 +46,7 @@ void Int3(void);
 #if defined(__clang__)
 #define Int3() __builtin_debugtrap()
 #elif defined(__GNUC__) && (defined(__i386__) || defined(__amd64__))
-#define Int3() ({ asm volatile ("int $3") })
+#define Int3() ({ asm volatile ("int $3"); })
 #elif defined __WATCOMC__
 #pragma aux Int3 = "int 3h";
 #elif defined _MSC_VER
diff --git a/include/pstypes.h b/include/pstypes.h
index 03800d4c..4a1373f2 100644
--- a/include/pstypes.h
+++ b/include/pstypes.h
@@ -20,6 +20,10 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifndef _TYPES_H
 #define _TYPES_H
 
+
+#include <stdint.h>
+
+
 //define a signed byte
 typedef signed char sbyte;
 
diff --git a/libmve/decoder16.c b/libmve/decoder16.c
index d72ca982..c1963c3d 100644
--- a/libmve/decoder16.c
+++ b/libmve/decoder16.c
@@ -74,9 +74,8 @@ void decodeFrame16(unsigned char *pFrame, unsigned char *pMap, int mapRemain, un
         FramePtr += 7*g_width;
     }
 
-    if ((length-(pData-pOrig)) != 0) {
-        fprintf(stderr, "DEBUG: junk left over: %ld,%d,%ld\n", (pData-pOrig), length, (length-(pData-pOrig)));
-    }
+	if ( (length - (pData - pOrig)) != 0 )
+		fprintf(stderr, "DEBUG: junk left over: %d,%d,%d\n", (int)(pData-pOrig), length, (int)(length-(pData-pOrig)));
 }
 
 static unsigned short GETPIXEL(unsigned char **buf, int off)
diff --git a/main/multi.c b/main/multi.c
index 2475e408..16a7ed8d 100644
--- a/main/multi.c
+++ b/main/multi.c
@@ -4909,7 +4909,7 @@ void multi_add_lifetime_kills ()
 
 	int oldrank;
 
-	if (!Game_mode & GM_NETWORK)
+	if ( !(Game_mode & GM_NETWORK) )
 		return;
 
 	oldrank=GetMyNetRanking();
@@ -4936,7 +4936,7 @@ void multi_add_lifetime_killed ()
 
 	int oldrank;
 
-	if (!Game_mode & GM_NETWORK)
+	if ( !(Game_mode & GM_NETWORK) )
 		return;
 
 	oldrank=GetMyNetRanking();
diff --git a/main/network.c b/main/network.c
index e9d6461e..6f87699a 100644
--- a/main/network.c
+++ b/main/network.c
@@ -2918,7 +2918,7 @@ void network_game_param_poll( int nitems, newmenu_item * menus, int * key, int c
 		}
 		#endif
 
-	     if (!Netgame.game_flags & NETGAME_FLAG_SHOW_MAP) 
+		if ( !(Netgame.game_flags & NETGAME_FLAG_SHOW_MAP) )
 			Netgame.game_flags |= NETGAME_FLAG_SHOW_MAP;
 
 		if (Netgame.PlayTimeAllowed || Netgame.KillGoal)
-- 
2.39.2