From c100b72c5d47bfa9fc9f09ecce0f069b6cf59087 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sat, 21 Jun 2003 02:26:50 +0000 Subject: more namespacing with Rr* --- openbox/client.c | 8 ++++---- openbox/screen.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'openbox') diff --git a/openbox/client.c b/openbox/client.c index 24d77127..3849736a 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1340,10 +1340,10 @@ void client_update_icons(Client *self) ++y; } self->icons[j].data[t] = - (((data[i] >> 24) & 0xff) << default_alpha_offset) + - (((data[i] >> 16) & 0xff) << default_red_offset) + - (((data[i] >> 8) & 0xff) << default_green_offset) + - (((data[i] >> 0) & 0xff) << default_blue_offset); + (((data[i] >> 24) & 0xff) << RrDefaultAlphaOffset) + + (((data[i] >> 16) & 0xff) << RrDefaultRedOffset) + + (((data[i] >> 8) & 0xff) << RrDefaultGreenOffset) + + (((data[i] >> 0) & 0xff) << RrDefaultBlueOffset); } g_assert(i <= num); } diff --git a/openbox/screen.c b/openbox/screen.c index d438a800..a1bf55fa 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -11,7 +11,7 @@ #include "focus.h" #include "dispatch.h" #include "extensions.h" -#include "../render/render.h" +#include "render/render.h" #ifdef USE_LIBSN # define SN_API_NOT_YET_FROZEN -- cgit v1.2.3