From 11e5099eb7abb2e016527795ffd32c5094e5324f Mon Sep 17 00:00:00 2001 From: tma Date: Fri, 4 Nov 2005 22:32:00 +0000 Subject: * Replaced a bunch of inline and __inline with ID_INLINE * Replaced a bunch of __i386__ with id386 * General tidy up of asm preprocessor decisions * Removed C_ONLY from the dedicated server build git-svn-id: svn://svn.icculus.org/quake3/trunk@269 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/client/cl_cin.c | 2 +- code/client/snd_mix.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'code/client') diff --git a/code/client/cl_cin.c b/code/client/cl_cin.c index f518ceb..1a54005 100644 --- a/code/client/cl_cin.c +++ b/code/client/cl_cin.c @@ -645,7 +645,7 @@ static unsigned short yuv_to_rgb( long y, long u, long v ) ******************************************************************************/ #if defined(MACOS_X) -static inline unsigned int yuv_to_rgb24( long y, long u, long v ) +static ID_INLINE unsigned int yuv_to_rgb24( long y, long u, long v ) { long r,g,b,YY; diff --git a/code/client/snd_mix.c b/code/client/snd_mix.c index 1c3a1da..21adf90 100644 --- a/code/client/snd_mix.c +++ b/code/client/snd_mix.c @@ -34,7 +34,6 @@ int* snd_p; int snd_linear_count; short* snd_out; -#if !( (defined __GNUC__) && (defined __i386__) ) // if not a GNU x86 target #if !id386 // if configured not to use asm void S_WriteLinearBlastStereo16 (void) @@ -61,6 +60,9 @@ void S_WriteLinearBlastStereo16 (void) snd_out[i+1] = val; } } +#elif defined(__GNUC__) +// uses snd_mixa.s +void S_WriteLinearBlastStereo16 (void); #else __declspec( naked ) void S_WriteLinearBlastStereo16 (void) @@ -107,10 +109,6 @@ LClampDone2: } } -#endif -#else -// forward declare, implementation somewhere else -void S_WriteLinearBlastStereo16 (void); #endif void S_TransferStereo16 (unsigned long *pbuf, int endtime) -- cgit v1.2.3