Fix ambiguity warnings.

This commit is contained in:
steve 2006-06-27 01:47:25 +00:00
parent 85d2833a62
commit 521750c007
1 changed files with 8 additions and 2 deletions

View File

@ -23,9 +23,13 @@
#include "lxt_write.h" #include "lxt_write.h"
#if defined(_MSC_VER) || defined(__MINGW32__) #if defined(_MSC_VER) || defined(__MINGW32__)
#ifndef fseeko
#define fseeko fseek #define fseeko fseek
#endif
#ifndef ftello
#define ftello ftell #define ftello ftell
#endif #endif
#endif
/************************ splay ************************/ /************************ splay ************************/
@ -1644,6 +1648,7 @@ if(!(s->flags&(LT_SYM_F_DOUBLE|LT_SYM_F_STRING)))
unsigned int last_change_delta; unsigned int last_change_delta;
if((lt->clock_compress)&&(s->rows==0)) if((lt->clock_compress)&&(s->rows==0))
{
if((len>1)&&(len<=32)) if((len>1)&&(len<=32))
{ {
int ivalue = value; int ivalue = value;
@ -1784,7 +1789,7 @@ if(!(s->flags&(LT_SYM_F_DOUBLE|LT_SYM_F_STRING)))
s->clk_prevval = ivalue + '0'; s->clk_prevval = ivalue + '0';
} }
}
/* normal trace handling */ /* normal trace handling */
last_change_delta = lt->position - s->last_change - 2; last_change_delta = lt->position - s->last_change - 2;
@ -2250,6 +2255,7 @@ if(!(s->flags&(LT_SYM_F_DOUBLE|LT_SYM_F_STRING)))
int len = ((s->flags)&LT_SYM_F_INTEGER) ? 32 : s->len; int len = ((s->flags)&LT_SYM_F_INTEGER) ? 32 : s->len;
if((lt->clock_compress)&&(s->rows==0)) if((lt->clock_compress)&&(s->rows==0))
{
if((len>1)&&(len<=32)) if((len>1)&&(len<=32))
{ {
int legal = 0; int legal = 0;
@ -2413,7 +2419,7 @@ if(!(s->flags&(LT_SYM_F_DOUBLE|LT_SYM_F_STRING)))
s->clk_prevval = value[0]; s->clk_prevval = value[0];
} }
}
/* normal trace handling */ /* normal trace handling */
last_change_delta = lt->position - s->last_change - 2; last_change_delta = lt->position - s->last_change - 2;