From d6e4128e9f2ca4f71fa1612c45f84bc45b82a5a2 Mon Sep 17 00:00:00 2001
From: tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Wed, 25 Jul 2007 21:28:15 +0000
Subject: * Fix a few -pedantic warnings

git-svn-id: svn://svn.icculus.org/quake3/trunk@1120 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 code/null/null_client.c   | 2 +-
 code/qcommon/cm_patch.c   | 2 +-
 code/qcommon/common.c     | 2 +-
 code/qcommon/vm_x86.c     | 2 +-
 code/unix/linux_signals.c | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/null/null_client.c b/code/null/null_client.c
index cd61453..a41063b 100644
--- a/code/null/null_client.c
+++ b/code/null/null_client.c
@@ -85,7 +85,7 @@ void CL_StartHunkUsers( void ) {
 }
 
 // bk001119 - added new dummy for sv_init.c
-void CL_ShutdownAll(void) {};
+void CL_ShutdownAll(void) {}
 
 // bk001208 - added new dummy (RC4)
 qboolean CL_CDKeyValidate( const char *key, const char *checksum ) { return qtrue; }
diff --git a/code/qcommon/cm_patch.c b/code/qcommon/cm_patch.c
index c29a329..88e3697 100644
--- a/code/qcommon/cm_patch.c
+++ b/code/qcommon/cm_patch.c
@@ -1153,7 +1153,7 @@ struct patchCollide_s	*CM_GeneratePatchCollide( int width, int height, vec3_t *p
 
 	if ( width <= 2 || height <= 2 || !points ) {
 		Com_Error( ERR_DROP, "CM_GeneratePatchFacets: bad parameters: (%i, %i, %p)",
-			width, height, points );
+			width, height, (void *)points );
 	}
 
 	if ( !(width & 1) || !(height & 1) ) {
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index defb5fa..3c37656 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -1256,7 +1256,7 @@ void Com_Meminfo_f( void ) {
 	for (block = mainzone->blocklist.next ; ; block = block->next) {
 		if ( Cmd_Argc() != 1 ) {
 			Com_Printf ("block:%p    size:%7i    tag:%3i\n",
-				block, block->size, block->tag);
+				(void *)block, block->size, block->tag);
 		}
 		if ( block->tag ) {
 			zoneBytes += block->size;
diff --git a/code/qcommon/vm_x86.c b/code/qcommon/vm_x86.c
index 527ee72..8b6e4a1 100644
--- a/code/qcommon/vm_x86.c
+++ b/code/qcommon/vm_x86.c
@@ -212,7 +212,7 @@ void callAsmCall(void)
 // arbitrarily named (though this is not true for the MSC version).  When a vm
 // makes a system call, control jumps straight to the doAsmCall label.
 void AsmCall( void ) {
-	asm( CMANG(doAsmCall) ":				\n\t" \
+	__asm__( CMANG(doAsmCall) ":				\n\t" \
 		"	movl (%%edi),%%eax			\n\t" \
 		"	subl $4,%%edi				\n\t" \
 		"	orl %%eax,%%eax				\n\t" \
diff --git a/code/unix/linux_signals.c b/code/unix/linux_signals.c
index 3e95f54..4653fbe 100644
--- a/code/unix/linux_signals.c
+++ b/code/unix/linux_signals.c
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../renderer/tr_local.h"
 #endif
 
-static qboolean signalcaught = qfalse;;
+static qboolean signalcaught = qfalse;
 
 void Sys_Exit(int); // bk010104 - abstraction
 
-- 
cgit v1.2.3