summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2010-02-15 09:39:59 +0100
committerAlexander Larsson <alexl@redhat.com>2010-02-19 11:25:41 +0100
commit5dee05fcab16dbd3e2c5e4d85b9edf26cf523e3f (patch)
tree1aa538a9204df1231fc5634dbd9305bc6bf65cf5
parent61f4ed9c7a3ff6afbbb42d3f3b8dc3b9331bdcbd (diff)
Move SCREEN_SHIFT_LEFT/RIGHT to pixman-private.h
This is needed for later use in other code.
-rw-r--r--pixman/pixman-edge-imp.h8
-rw-r--r--pixman/pixman-private.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/pixman/pixman-edge-imp.h b/pixman/pixman-edge-imp.h
index a30f8210..74720d10 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 c99b1017..efc690d3 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
*/