From 362f8c86124eb88ae46d0a1b6cf004b99d7be98c Mon Sep 17 00:00:00 2001
From: Jonathan Gray <jsg@jsg.id.au>
Date: Mon, 22 Apr 2013 22:48:31 +1000
Subject: [PATCH] rename variables named Status to status to prevent collision
 with X11

---
 code/client/cl_cin.cpp  |  4 ++--
 code/client/snd_dma.cpp | 16 ++++++++--------
 code/client/snd_local.h |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/code/client/cl_cin.cpp b/code/client/cl_cin.cpp
index 39d17b7..243fa0e 100644
--- a/code/client/cl_cin.cpp
+++ b/code/client/cl_cin.cpp
@@ -1855,9 +1855,9 @@ void SCR_RunCinematic (void)
 	CL_CheckPendingCinematic();
 
 	if (CL_handle >= 0 && CL_handle < MAX_VIDEO_HANDLES) {
-		e_status Status = CIN_RunCinematic(CL_handle);
+		e_status status = CIN_RunCinematic(CL_handle);
 		
-		if (CL_IsRunningInGameCinematic() && Status == FMV_IDLE  && !cinTable[CL_handle].holdAtEnd)
+		if (CL_IsRunningInGameCinematic() && status == FMV_IDLE  && !cinTable[CL_handle].holdAtEnd)
 		{
 			SCR_StopCinematic();	// change ROQ from FMV_IDLE to FMV_EOF, and clear some other vars
 		}
diff --git a/code/client/snd_dma.cpp b/code/client/snd_dma.cpp
index 143bf62..5ae9f49 100644
--- a/code/client/snd_dma.cpp
+++ b/code/client/snd_dma.cpp
@@ -555,7 +555,7 @@ void S_Init( void ) {
 			for (j = 0; j < NUM_STREAMING_BUFFERS; j++)
 			{
 				alGenBuffers(1, &(ch->buffers[j].BufferID));
-				ch->buffers[j].Status = UNQUEUED;
+				ch->buffers[j].status = UNQUEUED;
 				ch->buffers[j].Data = (char *)Z_Malloc(STREAMING_BUFFER_SIZE, TAG_SND_RAWDATA, qfalse);
 			}
 		}
@@ -672,7 +672,7 @@ void S_Shutdown( void )
 			{
 				alDeleteBuffers(1, &(ch->buffers[j].BufferID));
 				ch->buffers[j].BufferID = 0;
-				ch->buffers[j].Status = UNQUEUED;
+				ch->buffers[j].status = UNQUEUED;
 				if (ch->buffers[j].Data)
 				{
 					Z_Free(ch->buffers[j].Data);
@@ -2862,7 +2862,7 @@ void S_Update_(void) {
 
 				// Reset streaming buffers status's
 				for (i = 0; i < NUM_STREAMING_BUFFERS; i++)
-					ch->buffers[i].Status = UNQUEUED;
+					ch->buffers[i].status = UNQUEUED;
 
 				// Decode (STREAMING_BUFFER_SIZE / 1152) MP3 frames for each of the NUM_STREAMING_BUFFERS AL Buffers
 				for (i = 0; i < NUM_STREAMING_BUFFERS; i++)
@@ -2914,7 +2914,7 @@ void S_Update_(void) {
 					alSourceQueueBuffers(s_channels[source].alSource, 1, &(ch->buffers[i].BufferID));
 					if (alGetError() == AL_NO_ERROR)
 					{
-						ch->buffers[i].Status = QUEUED;
+						ch->buffers[i].status = QUEUED;
 					}
 				}
 
@@ -3095,7 +3095,7 @@ void UpdateSingleShotSounds()
 						{
 							if (ch->buffers[j].BufferID == buffer)
 							{
-								ch->buffers[j].Status = UNQUEUED;
+								ch->buffers[j].status = UNQUEUED;
 								break;
 							}
 						}
@@ -3106,7 +3106,7 @@ void UpdateSingleShotSounds()
 
 					for (j = 0; j < NUM_STREAMING_BUFFERS; j++)
 					{
-						if ((ch->buffers[j].Status == UNQUEUED) & (ch->MP3StreamHeader.iSourceBytesRemaining > 0))
+						if ((ch->buffers[j].status == UNQUEUED) & (ch->MP3StreamHeader.iSourceBytesRemaining > 0))
 						{
 							nTotalBytesDecoded = 0;
 		
@@ -3156,7 +3156,7 @@ void UpdateSingleShotSounds()
 								alSourceQueueBuffers(ch->alSource, 1, &(ch->buffers[j].BufferID));
 
 								// Update status of Buffer
-								ch->buffers[j].Status = QUEUED;
+								ch->buffers[j].status = QUEUED;
 
 								break;
 							}
@@ -3169,7 +3169,7 @@ void UpdateSingleShotSounds()
 								alSourceQueueBuffers(ch->alSource, 1, &(ch->buffers[j].BufferID));
 								
 								// Update status of Buffer
-								ch->buffers[j].Status = QUEUED;
+								ch->buffers[j].status = QUEUED;
 							}
 						}
 					}
diff --git a/code/client/snd_local.h b/code/client/snd_local.h
index b4472e4..0cb2112 100644
--- a/code/client/snd_local.h
+++ b/code/client/snd_local.h
@@ -82,7 +82,7 @@ typedef struct {
 typedef struct
 {
 	ALuint	BufferID;
-	ALuint	Status;
+	ALuint	status;
 	char	*Data;
 } STREAMINGBUFFER;