diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-12 18:20:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-12 18:20:04 +0000 |
| commit | da8fe31a7ba4acf109097d5696ad0145b991cdfd (patch) | |
| tree | 1c74d6f075702a73e557872f2a6f020ea4eb5432 /xorg-server/exa | |
| parent | 6590f805a12779909cb8504c230fa367148fe38c (diff) | |
| parent | 529dcfd0858d75cb3c87c73cb0f81dd20bbb9230 (diff) | |
| download | vcxsrv-da8fe31a7ba4acf109097d5696ad0145b991cdfd.tar.gz vcxsrv-da8fe31a7ba4acf109097d5696ad0145b991cdfd.tar.bz2 vcxsrv-da8fe31a7ba4acf109097d5696ad0145b991cdfd.zip | |
Changes for VC compilation
Diffstat (limited to 'xorg-server/exa')
| -rw-r--r-- | xorg-server/exa/exa_accel.c | 2 | ||||
| -rw-r--r-- | xorg-server/exa/exa_migration.c | 12 | ||||
| -rw-r--r-- | xorg-server/exa/makefile | 4 |
3 files changed, 11 insertions, 7 deletions
diff --git a/xorg-server/exa/exa_accel.c b/xorg-server/exa/exa_accel.c index 3ec96253d..c049745f2 100644 --- a/xorg-server/exa/exa_accel.c +++ b/xorg-server/exa/exa_accel.c @@ -255,7 +255,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.c b/xorg-server/exa/exa_migration.c index b7cc06240..adfbacc9e 100644 --- a/xorg-server/exa/exa_migration.c +++ b/xorg-server/exa/exa_migration.c @@ -169,7 +169,7 @@ exaCopyDirty(ExaMigrationPtr migrate, RegionPtr pValidDst, RegionPtr pValidSrc, static Bool firsttime = TRUE; if (firsttime) { - ErrorF("%s: Pending damage region empty!\n", __func__); + ErrorF("%s: Pending damage region empty!\n", __FUNCTION__ ); firsttime = FALSE; } } @@ -354,8 +354,8 @@ exaDoMoveInPixmap (ExaMigrationPtr migrate) void exaMoveInPixmap (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); @@ -395,8 +395,8 @@ exaDoMoveOutPixmap (ExaMigrationPtr migrate) void exaMoveOutPixmap (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); @@ -589,7 +589,7 @@ exaDoMigration (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/makefile b/xorg-server/exa/makefile new file mode 100644 index 000000000..0373a4be3 --- /dev/null +++ b/xorg-server/exa/makefile @@ -0,0 +1,4 @@ +CSRCS=exa.c exa_accel.c exa_migration.c exa_offscreen.c exa_render.c exa_unaccel.c
+
+LIBRARY=libexa
+
|