diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-10-23 11:16:54 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-06 20:26:29 +0100 |
| commit | b19defc32740225273c7efa63a784de18cde3dd1 (patch) | |
| tree | 8c38cd1d594c06efcf27e98ccc44ac533a359d2e /include/debug.h | |
| parent | 9343724fcc4db909f19977523121b7597ab5f6c7 (diff) | |
| download | msitools-b19defc32740225273c7efa63a784de18cde3dd1.tar.gz msitools-b19defc32740225273c7efa63a784de18cde3dd1.tar.xz msitools-b19defc32740225273c7efa63a784de18cde3dd1.zip | |
get rid of stupid Win32 integer types
Diffstat (limited to 'include/debug.h')
| -rw-r--r-- | include/debug.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/debug.h b/include/debug.h index eeda9b6..9d38a20 100644 --- a/include/debug.h +++ b/include/debug.h @@ -68,7 +68,7 @@ static inline const char *wine_dbgstr_wn( const WCHAR *s, int n ) static int i; CHAR *ret; - DWORD len; + unsigned len; if (!s) return ""; i = (i + 1) % 10; @@ -86,7 +86,7 @@ static inline const char *wine_dbg_sprintf( const char *format, ...) static int i; CHAR *ret; - DWORD len; + unsigned len; va_list ap; va_start(ap, format); @@ -120,7 +120,7 @@ static inline const char *wine_dbgstr_w( const WCHAR *s ) static inline const char *wine_dbgstr_guid( const GUID *id ) { if (!id) return "(null)"; - if (!((ULONG_PTR)id >> 16)) return wine_dbg_sprintf( "<guid-0x%04hx>", (WORD)(ULONG_PTR)id ); + if (!((uintptr_t)id >> 16)) return wine_dbg_sprintf( "<guid-0x%04hx>", (WORD)(uintptr_t)id ); return wine_dbg_sprintf( "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", id->Data1, id->Data2, id->Data3, id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], @@ -146,7 +146,7 @@ static inline const char *wine_dbgstr_rect( const RECT *rect ) rect->right, rect->bottom ); } -static inline const char *wine_dbgstr_longlong( ULONGLONG ll ) +static inline const char *wine_dbgstr_longlong( unsigned long long ll ) { if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) return wine_dbg_sprintf( "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll ); |