summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <ssp@redhat.com>2011-03-11 16:07:24 -0500
committerSøren Sandmann Pedersen <ssp@redhat.com>2011-08-19 20:01:36 -0400
commit2f443466bb9b8901f658e30c606ddacc4fed8535 (patch)
treeedb3f38b5f7331d8428f6eba81ebd7d067ef4834
parente58b208958900803f74d5e20c855bcb14752d976 (diff)
Rename pixman-fast-path.h to pixman-inlines.h
It is not really specific to pixman-fast-path.c.
-rw-r--r--pixman/Makefile.am2
-rw-r--r--pixman/pixman-arm-common.h2
-rw-r--r--pixman/pixman-arm-simd.c2
-rw-r--r--pixman/pixman-fast-path.c2
-rw-r--r--pixman/pixman-inlines.h (renamed from pixman/pixman-fast-path.h)0
-rw-r--r--pixman/pixman-noop.c2
-rw-r--r--pixman/pixman-sse2.c2
-rw-r--r--test/scaling-helpers-test.c2
8 files changed, 7 insertions, 7 deletions
diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index 1e20bb0..44e6b17 100644
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -22,7 +22,6 @@ libpixman_1_la_SOURCES = \
pixman.c \
pixman-noop.c \
pixman-fast-path.c \
- pixman-fast-path.h \
pixman-solid-fill.c \
pixman-conical-gradient.c \
pixman-linear-gradient.c \
@@ -32,6 +31,7 @@ libpixman_1_la_SOURCES = \
pixman-edge.c \
pixman-edge-accessors.c \
pixman-edge-imp.h \
+ pixman-inlines.h \
pixman-trap.c \
pixman-timer.c \
pixman-matrix.c
diff --git a/pixman/pixman-arm-common.h b/pixman/pixman-arm-common.h
index f1d212c..f56264e 100644
--- a/pixman/pixman-arm-common.h
+++ b/pixman/pixman-arm-common.h
@@ -26,7 +26,7 @@
#ifndef PIXMAN_ARM_COMMON_H
#define PIXMAN_ARM_COMMON_H
-#include "pixman-fast-path.h"
+#include "pixman-inlines.h"
/* Define some macros which can expand into proxy functions between
* ARM assembly optimized functions and the rest of pixman fast path API.
diff --git a/pixman/pixman-arm-simd.c b/pixman/pixman-arm-simd.c
index a66f8df..3d19bfa 100644
--- a/pixman/pixman-arm-simd.c
+++ b/pixman/pixman-arm-simd.c
@@ -29,7 +29,7 @@
#include "pixman-private.h"
#include "pixman-arm-common.h"
-#include "pixman-fast-path.h"
+#include "pixman-inlines.h"
#if 0 /* This code was moved to 'pixman-arm-simd-asm.S' */
diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c
index 9a6919e..bbdc8e8 100644
--- a/pixman/pixman-fast-path.c
+++ b/pixman/pixman-fast-path.c
@@ -30,7 +30,7 @@
#include <stdlib.h>
#include "pixman-private.h"
#include "pixman-combine32.h"
-#include "pixman-fast-path.h"
+#include "pixman-inlines.h"
static force_inline uint32_t
fetch_24 (uint8_t *a)
diff --git a/pixman/pixman-fast-path.h b/pixman/pixman-inlines.h
index 2b55c2e..2b55c2e 100644
--- a/pixman/pixman-fast-path.h
+++ b/pixman/pixman-inlines.h
diff --git a/pixman/pixman-noop.c b/pixman/pixman-noop.c
index 4f8c3a1..906a491 100644
--- a/pixman/pixman-noop.c
+++ b/pixman/pixman-noop.c
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include "pixman-private.h"
#include "pixman-combine32.h"
-#include "pixman-fast-path.h"
+#include "pixman-inlines.h"
static void
noop_composite (pixman_implementation_t *imp,
diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
index 3d51c2f..6689c53 100644
--- a/pixman/pixman-sse2.c
+++ b/pixman/pixman-sse2.c
@@ -34,7 +34,7 @@
#include <emmintrin.h> /* for SSE2 intrinsics */
#include "pixman-private.h"
#include "pixman-combine32.h"
-#include "pixman-fast-path.h"
+#include "pixman-inlines.h"
static __m128i mask_0080;
static __m128i mask_00ff;
diff --git a/test/scaling-helpers-test.c b/test/scaling-helpers-test.c
index c186138..a38cac5 100644
--- a/test/scaling-helpers-test.c
+++ b/test/scaling-helpers-test.c
@@ -4,7 +4,7 @@
#include <stdio.h>
#include <assert.h>
#include "utils.h"
-#include "pixman-fast-path.h"
+#include "pixman-inlines.h"
/* A trivial reference implementation for
* 'bilinear_pad_repeat_get_scanline_bounds'