diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-15 21:37:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-15 21:37:10 +0100 |
| commit | b7f01cb1f6cfd1ec301f650a073436c91ec614aa (patch) | |
| tree | 1dbf32344313ad7e5884e6686251cad398a231fa /xorg-server/exa/exa_migration_classic.c | |
| parent | 7b4b94b4449aec056c4c92f5cacc2f89a292a80e (diff) | |
| parent | 1b0fcca503ae9cf2d462b60770f96c794dfbb27a (diff) | |
| download | vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.gz vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.bz2 vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xkeyboard-config xserver git update 15 jan 2014
randrproto libfontenc mesa xserver git update 10 Jan 2014
randsrproto fontconfig libX11 git update 6 Jan 2014
Conflicts:
mesalib/src/glsl/builtin_functions.cpp
mesalib/src/glsl/ir_builder.h
xorg-server/Xext/xres.c
xorg-server/dix/dispatch.c
xorg-server/dix/dixfonts.c
xorg-server/hw/xwin/wingc.c
xorg-server/hw/xwin/winwindowswm.c
xorg-server/include/gc.h
xorg-server/os/access.c
Diffstat (limited to 'xorg-server/exa/exa_migration_classic.c')
| -rw-r--r-- | xorg-server/exa/exa_migration_classic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/exa/exa_migration_classic.c b/xorg-server/exa/exa_migration_classic.c index 65bbb17ce..89eff6200 100644 --- a/xorg-server/exa/exa_migration_classic.c +++ b/xorg-server/exa/exa_migration_classic.c @@ -350,7 +350,7 @@ exaDoMoveInPixmap(ExaMigrationPtr migrate) pExaPixmap->area = exaOffscreenAlloc(pScreen, pExaPixmap->fb_size, pExaScr->info->pixmapOffsetAlign, FALSE, - exaPixmapSave, (pointer) pPixmap); + exaPixmapSave, (void *) pPixmap); if (pExaPixmap->area == NULL) return; @@ -465,12 +465,12 @@ exaMigrateTowardFb(ExaMigrationPtr migrate) if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED) { DBG_MIGRATE(("UseScreen: not migrating pinned pixmap %p\n", - (pointer) pPixmap)); + (void *) pPixmap)); return; } DBG_MIGRATE(("UseScreen %p score %d\n", - (pointer) pPixmap, pExaPixmap->score)); + (void *) pPixmap, pExaPixmap->score)); if (pExaPixmap->score == EXA_PIXMAP_SCORE_INIT) { exaDoMoveInPixmap(migrate); @@ -504,7 +504,7 @@ exaMigrateTowardSys(ExaMigrationPtr migrate) ExaPixmapPriv(pPixmap); - DBG_MIGRATE(("UseMem: %p score %d\n", (pointer) pPixmap, + DBG_MIGRATE(("UseMem: %p score %d\n", (void *) pPixmap, pExaPixmap->score)); if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED) |