From 002d9e15c32bbf9ae7ee4d8471fa753cc28cd65a Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Tue, 27 Nov 2012 15:17:11 +0100 Subject: SourceX11, Main: Fix some arch-related warnings e.g. because of integer types --- src/Main.cxx | 2 +- src/SourceX11.cxx | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Main.cxx b/src/Main.cxx index 0fb9fc0..2bb4511 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -333,7 +333,7 @@ class Main extends View, Runnable bool first = true; DFBRegion flip; - D_DEBUG_AT( PluggIt_View, "%s( [%u], %p, %d )\n", __FUNCTION__, rects.size(), ptr, pitch ); + D_DEBUG_AT( PluggIt_View, "%s( [%zd], %p, %d )\n", __FUNCTION__, rects.size(), ptr, pitch ); D_ASSERT( rects.size() > 0 ); D_ASSERT( ptr != NULL ); diff --git a/src/SourceX11.cxx b/src/SourceX11.cxx index c67fc41..51073f4 100644 --- a/src/SourceX11.cxx +++ b/src/SourceX11.cxx @@ -57,7 +57,7 @@ class SourceX11 extends Source, Runnable }; - public SourceX11( View *view, const Config &config ) : m_updates(16), Source( view, config ) { + public SourceX11( View *view, const Config &config ) : Source( view, config ), m_updates(16) { D_DEBUG_AT( PluggIt_SourceX11, "%s( %p )\n", __FUNCTION__, view ); XInitThreads(); @@ -224,7 +224,7 @@ class SourceX11 extends Source, Runnable const DFBRegion &bounding = m_updates.bounding(); - D_DEBUG_AT( PluggIt_SourceX11, " -> %4d,%4d-%4dx%4d (%d regions, %d rectangles)\n", + D_DEBUG_AT( PluggIt_SourceX11, " -> %4d,%4d-%4dx%4d (%d regions, %zd rectangles)\n", DFB_RECTANGLE_VALS_FROM_REGION( &bounding ), m_updates.num_regions(), rects.size() ); m_updates.reset(); @@ -372,7 +372,7 @@ class SourceX11 extends Source, Runnable False, AnyPropertyType, &actual_type, &format, &n, &extra, (unsigned char **) &name ); - D_DEBUG_AT( PluggIt_SourceX11, "%s( %u ) -> '%s'\n", __FUNCTION__, window, name ); + D_DEBUG_AT( PluggIt_SourceX11, "%s( %lu ) -> '%s'\n", __FUNCTION__, window, name ); if (name) { str.append( name ); @@ -390,7 +390,7 @@ class SourceX11 extends Source, Runnable Window w = None, root, parent, *children; unsigned int num_children; - D_DEBUG_AT( PluggIt_SourceX11, "%s( %u, %s )\n", __FUNCTION__, window, title.c_str() ); + D_DEBUG_AT( PluggIt_SourceX11, "%s( %lu, %s )\n", __FUNCTION__, window, title.c_str() ); t = getWindowTitle( window ); if (t == title || t.find( title ) < t.size()) @@ -456,7 +456,7 @@ class SourceX11 extends Source, Runnable D_DEBUG_AT( PluggIt_SourceX11, " -> button %d press at %d,%d\n", event.xbutton.button, event.xbutton.x, event.xbutton.y ); - D_DEBUG_AT( PluggIt_SourceX11, " -> sub window %u: '%s'\n", + D_DEBUG_AT( PluggIt_SourceX11, " -> sub window %lu: '%s'\n", event.xbutton.subwindow, getWindowTitle( event.xbutton.subwindow ).c_str() ); win = lookupManagedWindow( event.xbutton.subwindow ); @@ -491,7 +491,7 @@ class SourceX11 extends Source, Runnable wm_state_atom = XInternAtom( m_display, "WM_STATE", False ); - D_DEBUG_AT( PluggIt_SourceX11, " -> Retrieving WM_STATE (Atom %d)...\n", wm_state_atom ); + D_DEBUG_AT( PluggIt_SourceX11, " -> Retrieving WM_STATE (Atom %ld)...\n", wm_state_atom ); result = XGetWindowProperty( m_display, window, wm_state_atom, 0, LONG_MAX, False, wm_state_atom, -- cgit