Fix the build: standard macro arg lists use ... and __VA_ARGS__ but do

not allow specific names for the arg lists.
This commit is contained in:
John Bauer
2007-04-23 16:35:17 +00:00
parent 25d66981ec
commit ee0c5123b1
5 changed files with 43 additions and 43 deletions
+6 -6
View File
@@ -23,7 +23,7 @@
#include <zlib.h>
#endif
#define Trace(args...) if( LOG ) LOG->Trace( args ); else fprintf( stderr, args )
#define TRACE(...) if( LOG ) LOG->Trace( __VA_ARGS__ ); else fprintf( stderr, __VA_ARGS__ )
RageFileObjInflate::RageFileObjInflate( RageFileBasic *pFile, int iUncompressedSize )
{
@@ -39,7 +39,7 @@ RageFileObjInflate::RageFileObjInflate( RageFileBasic *pFile, int iUncompressedS
if( err == Z_MEM_ERROR )
RageException::Throw( "inflateInit2( %i ): out of memory.", -MAX_WBITS );
if( err != Z_OK )
Trace( "Huh? inflateInit2() err = %i", err );
TRACE( "Huh? inflateInit2() err = %i", err );
decomp_buf_ptr = decomp_buf;
m_iFilePos = 0;
@@ -75,7 +75,7 @@ RageFileObjInflate::~RageFileObjInflate()
int err = inflateEnd( m_pInflate );
if( err != Z_OK )
Trace( "Huh? inflateEnd() err = %i", err );
TRACE( "Huh? inflateEnd() err = %i", err );
delete m_pInflate;
}
@@ -130,7 +130,7 @@ int RageFileObjInflate::ReadInternal( void *buf, size_t bytes )
case Z_OK:
break;
default:
Trace( "Huh? inflate err %i", err );
TRACE( "Huh? inflate err %i", err );
}
const int used = (char *)m_pInflate->next_in - decomp_buf_ptr;
@@ -207,7 +207,7 @@ RageFileObjDeflate::RageFileObjDeflate( RageFileBasic *pFile )
if( err == Z_MEM_ERROR )
RageException::Throw( "inflateInit2( %i ): out of memory.", -MAX_WBITS );
if( err != Z_OK )
Trace( "Huh? inflateInit2() err = %i", err );
TRACE( "Huh? inflateInit2() err = %i", err );
}
@@ -220,7 +220,7 @@ RageFileObjDeflate::~RageFileObjDeflate()
int err = deflateEnd( m_pDeflate );
if( err != Z_OK )
Trace( "Huh? deflateEnd() err = %i", err );
TRACE( "Huh? deflateEnd() err = %i", err );
delete m_pDeflate;
}