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/renderer | |
| 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/renderer')
| -rw-r--r-- | code/renderer/tr_local.h | 2 | ||||
| -rw-r--r-- | code/renderer/tr_main.c | 2 | ||||
| -rw-r--r-- | code/renderer/tr_shade_calc.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h index d1dc328..0ff0157 100644 --- a/code/renderer/tr_local.h +++ b/code/renderer/tr_local.h @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA typedef unsigned int glIndex_t; // fast float to int conversion -#if id386 && !( (defined __GNUC__ ) && (defined __i386__ ) ) // rb010123 +#if id386 && !defined(__GNUC__) long myftol( float f ); #else #define myftol(x) ((int)(x)) diff --git a/code/renderer/tr_main.c b/code/renderer/tr_main.c index 294fdb4..6111248 100644 --- a/code/renderer/tr_main.c +++ b/code/renderer/tr_main.c @@ -1004,7 +1004,7 @@ DRAWSURF SORTING R_Radix =============== */ -static __inline void R_Radix( int byte, int size, drawSurf_t *source, drawSurf_t *dest ) +static ID_INLINE void R_Radix( int byte, int size, drawSurf_t *source, drawSurf_t *dest ) { int count[ 256 ] = { 0 }; int index[ 256 ]; diff --git a/code/renderer/tr_shade_calc.c b/code/renderer/tr_shade_calc.c index 859beba..27bb89a 100644 --- a/code/renderer/tr_shade_calc.c +++ b/code/renderer/tr_shade_calc.c @@ -1022,7 +1022,7 @@ void RB_CalcRotateTexCoords( float degsPerSecond, float *st ) -#if id386 && !( (defined __GNUC__ ) && (defined __i386__ ) ) // rb010123 +#if id386 && !defined(__GNUC__) long myftol( float f ) { static int tmp; |