[PATCH 3/4] debug.h,
test.h: Temporary add ifdefs around some printfs to avoid format
Michael Stefaniuc
mstefani at redhat.de
Thu Sep 28 18:18:51 CDT 2006
warnings during the transition of DWORD/LONG/ULONG from long to int.
Yes it is ugly but Alexandre wanted it that way.
---
include/wine/debug.h | 13 +++++++++++++
include/wine/test.h | 4 ++++
2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/include/wine/debug.h b/include/wine/debug.h
index 18de451..152956d 100644
--- a/include/wine/debug.h
+++ b/include/wine/debug.h
@@ -196,19 +196,32 @@ static inline const char *wine_dbgstr_gu
static inline const char *wine_dbgstr_point( const POINT *pt )
{
if (!pt) return "(null)";
+#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)
return wine_dbg_sprintf( "(%ld,%ld)", pt->x, pt->y );
+#else
+ return wine_dbg_sprintf( "(%d,%d)", pt->x, pt->y );
+#endif
}
static inline const char *wine_dbgstr_size( const SIZE *size )
{
if (!size) return "(null)";
+#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)
return wine_dbg_sprintf( "(%ld,%ld)", size->cx, size->cy );
+#else
+ return wine_dbg_sprintf( "(%d,%d)", size->cx, size->cy );
+#endif
}
static inline const char *wine_dbgstr_rect( const RECT *rect )
{
if (!rect) return "(null)";
+#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)
return wine_dbg_sprintf( "(%ld,%ld)-(%ld,%ld)", rect->left, rect->top, rect->right, rect->bottom );
+#else
+ return wine_dbg_sprintf( "(%d,%d)-(%d,%d)", rect->left, rect->top,
+ rect->right, rect->bottom );
+#endif
}
static inline const char *wine_dbgstr_longlong( ULONGLONG ll )
diff --git a/include/wine/test.h b/include/wine/test.h
index 8e2bc62..8ef8a31 100644
--- a/include/wine/test.h
+++ b/include/wine/test.h
@@ -371,7 +371,11 @@ static int run_test( const char *name )
if (winetest_debug)
{
+#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)
fprintf( stdout, "%s: %ld tests executed, %ld marked as todo, %ld %s.\n",
+#else
+ fprintf( stdout, "%s: %d tests executed, %d marked as todo, %d %s.\n",
+#endif
name, successes + failures + todo_successes + todo_failures,
todo_successes, failures + todo_failures,
(failures + todo_failures != 1) ? "failures" : "failure" );
--
1.4.2.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20060929/ad46d289/attachment.pgp
More information about the wine-patches
mailing list