diff options
author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-09-23 02:59:15 +0000 |
---|---|---|
committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-09-23 02:59:15 +0000 |
commit | 48addd68a8c8d0c026be2d3b87ea6ce23509da91 (patch) | |
tree | 51a4a3f689906393882efed44c3387851a7d3dce /code/client | |
parent | 5427364410d9be3d29e35b2d9fd4194c3878e3c0 (diff) | |
download | ioquake3-aero-48addd68a8c8d0c026be2d3b87ea6ce23509da91.tar.gz ioquake3-aero-48addd68a8c8d0c026be2d3b87ea6ce23509da91.zip |
* Replaced lots of __linux__ || __FreeBSD__ with __GNUC__
* MinGW port now uses asm versions of SnapVector and ftol
* Improved the handling of mangled symbols in vm_x86.c
git-svn-id: svn://svn.icculus.org/quake3/trunk@99 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/client')
-rw-r--r-- | code/client/cl_keys.c | 2 | ||||
-rw-r--r-- | code/client/snd_mix.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/code/client/cl_keys.c b/code/client/cl_keys.c index cf14d97..9d2a3f5 100644 --- a/code/client/cl_keys.c +++ b/code/client/cl_keys.c @@ -1040,7 +1040,7 @@ void CL_KeyEvent (int key, qboolean down, unsigned time) { } } -#ifdef __linux__ +#ifndef _WIN32 if (key == K_ENTER) { if (down) diff --git a/code/client/snd_mix.c b/code/client/snd_mix.c index 8426b60..a363c6a 100644 --- a/code/client/snd_mix.c +++ b/code/client/snd_mix.c @@ -34,8 +34,8 @@ int* snd_p; int snd_linear_count; short* snd_out; -#if !( (defined __linux__ || defined __FreeBSD__ || defined __MINGW32__ ) && (defined __i386__) ) // rb010123 -#if !id386 +#if !( (defined __GNUC__) && (defined __i386__) ) // if not a GNU x86 target +#if !id386 // if configured not to use asm void S_WriteLinearBlastStereo16 (void) { |