diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-11-04 22:32:00 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-11-04 22:32:00 +0000 |
| commit | 11e5099eb7abb2e016527795ffd32c5094e5324f (patch) | |
| tree | 3de0470c8544b681df252ad1c5e3724320b54d9c /code/client | |
| parent | 657f95c6a5d8a24df0c1a206eb32f54985c7b4fe (diff) | |
| download | ioquake3-aero-11e5099eb7abb2e016527795ffd32c5094e5324f.tar.gz ioquake3-aero-11e5099eb7abb2e016527795ffd32c5094e5324f.zip | |
* 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
Diffstat (limited to 'code/client')
| -rw-r--r-- | code/client/cl_cin.c | 2 | ||||
| -rw-r--r-- | code/client/snd_mix.c | 8 |
2 files changed, 4 insertions, 6 deletions
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) @@ -108,10 +110,6 @@ LClampDone2: } #endif -#else -// forward declare, implementation somewhere else -void S_WriteLinearBlastStereo16 (void); -#endif void S_TransferStereo16 (unsigned long *pbuf, int endtime) { |