From 5dee05fcab16dbd3e2c5e4d85b9edf26cf523e3f Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 15 Feb 2010 09:39:59 +0100 Subject: [PATCH] Move SCREEN_SHIFT_LEFT/RIGHT to pixman-private.h This is needed for later use in other code. --- pixman/pixman-edge-imp.h | 8 -------- pixman/pixman-private.h | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pixman/pixman-edge-imp.h b/pixman/pixman-edge-imp.h index a30f821..74720d1 100644 --- a/pixman/pixman-edge-imp.h +++ b/pixman/pixman-edge-imp.h @@ -79,14 +79,6 @@ RASTERIZE_EDGES (pixman_image_t *image, #if N_BITS == 1 { -#ifdef WORDS_BIGENDIAN -# define SCREEN_SHIFT_LEFT(x,n) ((x) << (n)) -# define SCREEN_SHIFT_RIGHT(x,n) ((x) >> (n)) -#else -# define SCREEN_SHIFT_LEFT(x,n) ((x) >> (n)) -# define SCREEN_SHIFT_RIGHT(x,n) ((x) << (n)) -#endif - #define LEFT_MASK(x) \ (((x) & 0x1f) ? \ SCREEN_SHIFT_RIGHT (0xffffffff, (x) & 0x1f) : 0) diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h index c99b101..efc690d 100644 --- a/pixman/pixman-private.h +++ b/pixman/pixman-private.h @@ -749,6 +749,14 @@ pixman_region16_copy_from_region32 (pixman_region16_t *dst, PIXMAN_FORMAT_G (f) > 8 || \ PIXMAN_FORMAT_B (f) > 8) +#ifdef WORDS_BIGENDIAN +# define SCREEN_SHIFT_LEFT(x,n) ((x) << (n)) +# define SCREEN_SHIFT_RIGHT(x,n) ((x) >> (n)) +#else +# define SCREEN_SHIFT_LEFT(x,n) ((x) >> (n)) +# define SCREEN_SHIFT_RIGHT(x,n) ((x) << (n)) +#endif + /* * Various debugging code */ -- 2.7.4