Fixed preprocessor invalid tokens in newer gcc 3.x versions.

This commit is contained in:
guillemj
2003-06-28 19:10:36 +00:00
parent f40ae0ac13
commit 4df65b726c
2 changed files with 12 additions and 6 deletions

View File

@@ -19,6 +19,9 @@
**
** $Header$
** $Log$
** Revision 1.1.1.1 1999/12/07 21:49:26 joseph
** Initial checkin into SourceForge.
**
**
** 3 3/17/99 6:16p Dow
** Phantom Menace and other fixes.
@@ -3353,16 +3356,16 @@ double_precision_asm(void);
//#define GLIDE3_DEBUG 1
#endif
#ifdef GLIDE3_DEBUG
#define TEX_INFO(ptr,field) ptr##field
#define TEX_INFO(ptr,field) ptr.field
#define G3_LOD_TRANSLATE(lod) (lod)
#define G3_ASPECT_TRANSLATE(aspect) (aspect)
#else
#define TEX_INFO(ptr,field) ptr##field##Log2
#define TEX_INFO(ptr,field) ptr.field ## Log2
#define G3_LOD_TRANSLATE(lod) (0x8-lod)
#define G3_ASPECT_TRANSLATE(aspect) (0x3-(aspect))
#endif /* GLIDE3_DEBUG */
#else
#define TEX_INFO(ptr,field) ptr##field
#define TEX_INFO(ptr,field) ptr.field
#define G3_LOD_TRANSLATE(lod) (lod)
#define G3_ASPECT_TRANSLATE(aspect) (aspect)
#endif

View File

@@ -19,6 +19,9 @@
**
** $Header$
** $Log$
** Revision 1.1.1.1 1999/12/07 21:49:28 joseph
** Initial checkin into SourceForge.
**
**
** 3 3/17/99 6:16p Dow
** Phantom Menace and other fixes.
@@ -239,9 +242,9 @@ static void
downloadTexture(Texture *texture, Gu3dfInfo *info)
{
texture->info.data = info->data;
TEX_INFO(texture->info.,smallLod) = info->header.small_lod;
TEX_INFO(texture->info.,largeLod) = info->header.large_lod;
TEX_INFO(texture->info.,aspectRatio) = info->header.aspect_ratio;
TEX_INFO(texture->info,smallLod) = info->header.small_lod;
TEX_INFO(texture->info,largeLod) = info->header.large_lod;
TEX_INFO(texture->info,aspectRatio) = info->header.aspect_ratio;
texture->info.format = info->header.format;
texture->addr = nextFreeBase;