r1027 - in trunk/code: client qcommon

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2007-01-07 11:03:19 -0500 (Sun, 07 Jan 2007)
New Revision: 1027

Modified:
   trunk/code/client/snd_openal.c
   trunk/code/qcommon/net_chan.c
Log:
- Fix two non-C-standard variable declarations.
- Fix function name of vsnprintf for windows systems.


Modified: trunk/code/client/snd_openal.c
===================================================================
--- trunk/code/client/snd_openal.c	2007-01-03 23:04:18 UTC (rev 1026)
+++ trunk/code/client/snd_openal.c	2007-01-07 16:03:19 UTC (rev 1027)
@@ -913,11 +913,14 @@
 static
 void S_AL_StartLocalSound(sfxHandle_t sfx, int channel)
 {
+	srcHandle_t src;
+	
 	if(S_AL_CheckInput(0, sfx))
 		return;
 
 	// Try to grab a source
-	srcHandle_t src = S_AL_SrcAlloc(SRCPRI_LOCAL, -1, channel);
+	src = S_AL_SrcAlloc(SRCPRI_LOCAL, -1, channel);
+	
 	if(src == -1)
 		return;
 
@@ -939,12 +942,13 @@
 void S_AL_StartSound( vec3_t origin, int entnum, int entchannel, sfxHandle_t sfx )
 {
 	vec3_t sorigin;
+	srcHandle_t src;
 
 	if(S_AL_CheckInput(origin ? 0 : entnum, sfx))
 		return;
 
 	// Try to grab a source
-	srcHandle_t src = S_AL_SrcAlloc(SRCPRI_ONESHOT, entnum, entchannel);
+	src = S_AL_SrcAlloc(SRCPRI_ONESHOT, entnum, entchannel);
 	if(src == -1)
 		return;
 

Modified: trunk/code/qcommon/net_chan.c
===================================================================
--- trunk/code/qcommon/net_chan.c	2007-01-03 23:04:18 UTC (rev 1026)
+++ trunk/code/qcommon/net_chan.c	2007-01-07 16:03:19 UTC (rev 1027)
@@ -719,7 +719,7 @@
 	string[3] = -1;
 
 	va_start( argptr, format );
-	vsnprintf( string+4, sizeof(string)-4, format, argptr );
+	Q_vsnprintf( string+4, sizeof(string)-4, format, argptr );
 	va_end( argptr );
 
 	// send the datagram