diff options
Diffstat (limited to 'xorg-server/exa')
| -rw-r--r-- | xorg-server/exa/exa_accel.c | 2 | ||||
| -rw-r--r-- | xorg-server/exa/exa_migration_classic.c | 10 | ||||
| -rw-r--r-- | xorg-server/exa/exa_unaccel.c | 2 | ||||
| -rw-r--r-- | xorg-server/exa/makefile | 14 |
4 files changed, 21 insertions, 7 deletions
diff --git a/xorg-server/exa/exa_accel.c b/xorg-server/exa/exa_accel.c index 5600539d6..3917621e1 100644 --- a/xorg-server/exa/exa_accel.c +++ b/xorg-server/exa/exa_accel.c @@ -243,7 +243,7 @@ exaPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, bits); } -static Bool inline +static Bool __inline exaCopyNtoNTwoDir (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, BoxPtr pbox, int nbox, int dx, int dy) { diff --git a/xorg-server/exa/exa_migration_classic.c b/xorg-server/exa/exa_migration_classic.c index dd3cd491e..2f01f8d24 100644 --- a/xorg-server/exa/exa_migration_classic.c +++ b/xorg-server/exa/exa_migration_classic.c @@ -373,8 +373,8 @@ exaDoMoveInPixmap (ExaMigrationPtr migrate) void exaMoveInPixmap_classic (PixmapPtr pPixmap) { - static ExaMigrationRec migrate = { .as_dst = FALSE, .as_src = TRUE, - .pReg = NULL }; + static ExaMigrationRec migrate = { FALSE, TRUE, + NULL, NULL }; migrate.pPix = pPixmap; exaDoMoveInPixmap (&migrate); @@ -414,8 +414,8 @@ exaDoMoveOutPixmap (ExaMigrationPtr migrate) void exaMoveOutPixmap_classic (PixmapPtr pPixmap) { - static ExaMigrationRec migrate = { .as_dst = FALSE, .as_src = TRUE, - .pReg = NULL }; + static ExaMigrationRec migrate = { FALSE, TRUE, + NULL, NULL }; migrate.pPix = pPixmap; exaDoMoveOutPixmap (&migrate); @@ -613,7 +613,7 @@ exaDoMigration_classic (ExaMigrationPtr pixmaps, int npixmaps, Bool can_accel) for (i = 0; i < npixmaps; i++) { if (!exaPixmapIsDirty (pixmaps[i].pPix) && !exaAssertNotDirty (pixmaps[i].pPix)) - ErrorF("%s: Pixmap %d dirty but not marked as such!\n", __func__, i); + ErrorF("%s: Pixmap %d dirty but not marked as such!\n", __FUNCTION__, i); } } /* If anything is pinned in system memory, we won't be able to diff --git a/xorg-server/exa/exa_unaccel.c b/xorg-server/exa/exa_unaccel.c index 219f903b2..492a352c6 100644 --- a/xorg-server/exa/exa_unaccel.c +++ b/xorg-server/exa/exa_unaccel.c @@ -758,7 +758,7 @@ exaGetPixmapFirstPixel (PixmapPtr pPixmap) return pixel; } default: - FatalError("%s called for invalid bpp %d\n", __func__, + FatalError("%s called for invalid bpp %d\n", __FUNCTION__, pPixmap->drawable.bitsPerPixel); } } diff --git a/xorg-server/exa/makefile b/xorg-server/exa/makefile new file mode 100644 index 000000000..5ad11a1ed --- /dev/null +++ b/xorg-server/exa/makefile @@ -0,0 +1,14 @@ +LIBRARY=libexa
+
+CSRCS = \
+ exa.c \
+ exa_classic.c \
+ exa_migration_classic.c \
+ exa_driver.c \
+ exa_mixed.c \
+ exa_migration_mixed.c \
+ exa_accel.c \
+ exa_glyphs.c \
+ exa_offscreen.c \
+ exa_render.c \
+ exa_unaccel.c
|