ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: The ok() macro shouldn't return a value.

Browse Source
This commit is contained in:
Alexandre Julliard 2010-02-24 16:48:07 +01:00
parent fbbac38e4e
commit 69ee0ad151
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/wine/test.h
View File

@ -88,21 +88,21 @@ extern void winetest_vskip( const char *msg, va_list ap );
#ifdef __GNUC__ #ifdef __GNUC__
extern int winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); extern void winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) ));
extern void winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); extern void winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2)));
extern void winetest_win_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); extern void winetest_win_skip( const char *msg, ... ) __attribute__((format (printf,1,2)));
extern void winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2))); extern void winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2)));
#else /* __GNUC__ */ #else /* __GNUC__ */
extern int winetest_ok( int condition, const char *msg, ... ); extern void winetest_ok( int condition, const char *msg, ... );
extern void winetest_skip( const char *msg, ... ); extern void winetest_skip( const char *msg, ... );
extern void winetest_win_skip( const char *msg, ... ); extern void winetest_win_skip( const char *msg, ... );
extern void winetest_trace( const char *msg, ... ); extern void winetest_trace( const char *msg, ... );
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#define ok_(file, line) (winetest_set_location(file, line), 0) ? 0 : winetest_ok #define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok
#define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip #define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip
#define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip #define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip
#define trace_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_trace #define trace_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_trace
@ -330,15 +330,13 @@ int winetest_vok( int condition, const char *msg, va_list args )
} }
} }
int winetest_ok( int condition, const char *msg, ... ) void winetest_ok( int condition, const char *msg, ... )
{ {
va_list valist; va_list valist;
int rc;
va_start(valist, msg); va_start(valist, msg);
rc=winetest_vok(condition, msg, valist); winetest_vok(condition, msg, valist);
va_end(valist); va_end(valist);
return rc;
} }
void winetest_trace( const char *msg, ... ) void winetest_trace( const char *msg, ... )