r1120 - in trunk/code: null qcommon unix

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Wed Jul 25 17:28:15 EDT 2007


Author: tma
Date: 2007-07-25 17:28:15 -0400 (Wed, 25 Jul 2007)
New Revision: 1120

Modified:
   trunk/code/null/null_client.c
   trunk/code/qcommon/cm_patch.c
   trunk/code/qcommon/common.c
   trunk/code/qcommon/vm_x86.c
   trunk/code/unix/linux_signals.c
Log:
* Fix a few -pedantic warnings


Modified: trunk/code/null/null_client.c
===================================================================
--- trunk/code/null/null_client.c	2007-07-20 15:39:45 UTC (rev 1119)
+++ trunk/code/null/null_client.c	2007-07-25 21:28:15 UTC (rev 1120)
@@ -85,7 +85,7 @@
 }
 
 // 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; }

Modified: trunk/code/qcommon/cm_patch.c
===================================================================
--- trunk/code/qcommon/cm_patch.c	2007-07-20 15:39:45 UTC (rev 1119)
+++ trunk/code/qcommon/cm_patch.c	2007-07-25 21:28:15 UTC (rev 1120)
@@ -1153,7 +1153,7 @@
 
 	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) ) {

Modified: trunk/code/qcommon/common.c
===================================================================
--- trunk/code/qcommon/common.c	2007-07-20 15:39:45 UTC (rev 1119)
+++ trunk/code/qcommon/common.c	2007-07-25 21:28:15 UTC (rev 1120)
@@ -1256,7 +1256,7 @@
 	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;

Modified: trunk/code/qcommon/vm_x86.c
===================================================================
--- trunk/code/qcommon/vm_x86.c	2007-07-20 15:39:45 UTC (rev 1119)
+++ trunk/code/qcommon/vm_x86.c	2007-07-25 21:28:15 UTC (rev 1120)
@@ -212,7 +212,7 @@
 // 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" \

Modified: trunk/code/unix/linux_signals.c
===================================================================
--- trunk/code/unix/linux_signals.c	2007-07-20 15:39:45 UTC (rev 1119)
+++ trunk/code/unix/linux_signals.c	2007-07-25 21:28:15 UTC (rev 1120)
@@ -27,7 +27,7 @@
 #include "../renderer/tr_local.h"
 #endif
 
-static qboolean signalcaught = qfalse;;
+static qboolean signalcaught = qfalse;
 
 void Sys_Exit(int); // bk010104 - abstraction
 




More information about the quake3-commits mailing list