add __ to variables declared in macros for safety

This was SVN commit r578.
This commit is contained in:
janwas 2004-06-21 14:16:10 +00:00
parent ff00971bc8
commit 250c46ee9e

View File

@ -60,23 +60,23 @@ STMT(\
#ifdef _WIN32 #ifdef _WIN32
#define CHECK_ERR(func)\ #define CHECK_ERR(func)\
STMT(\ STMT(\
int err = (int)(func);\ int err__ = (int)(func);\
if(err < 0)\ if(err__ < 0)\
{\ {\
assert(0 && "FYI: CHECK_ERR reports that a function failed."\ assert(0 && "FYI: CHECK_ERR reports that a function failed."\
"feel free to ignore or suppress this warning.");\ "feel free to ignore or suppress this warning.");\
return err;\ return err__;\
}\ }\
) )
#else #else
#define CHECK_ERR(func)\ #define CHECK_ERR(func)\
STMT(\ STMT(\
int err = (int)(func);\ int err__ = (int)(func);\
if(err < 0)\ if(err__ < 0)\
{\ {\
debug_out("%s:%d: FYI: CHECK_ERR reports that a function failed."\ debug_out("%s:%d: FYI: CHECK_ERR reports that a function failed."\
"feel free to ignore or suppress this warning.\n", __FILE__, __LINE__);\ "feel free to ignore or suppress this warning.\n", __FILE__, __LINE__);\
return err;\ return err__;\
}\ }\
) )
#endif #endif