diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-07 16:40:05 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-07 16:40:05 +0200 |
| commit | 8f0ed7f7a754df710b13b9dabbaa32b5d4211182 (patch) | |
| tree | 03bf52a933c29962894c2cec5f33028439cf4f5a /xorg-server/miext/shadow | |
| parent | 7d29f4054380e7f42722c280b9caedce9fa4ace9 (diff) | |
| parent | 81fd17c8678e89cea6610b8b2996b028b21eb5dc (diff) | |
| download | vcxsrv-8f0ed7f7a754df710b13b9dabbaa32b5d4211182.tar.gz vcxsrv-8f0ed7f7a754df710b13b9dabbaa32b5d4211182.tar.bz2 vcxsrv-8f0ed7f7a754df710b13b9dabbaa32b5d4211182.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver fontconfig libXdmcp mesa pixmand xkeyboard-config git update 7 oct 2013
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/privates.c
xorg-server/glx/glxcmds.c
xorg-server/hw/kdrive/ephyr/ephyr.h
xorg-server/hw/kdrive/ephyr/ephyrinit.c
xorg-server/hw/kdrive/ephyr/hostx.c
Diffstat (limited to 'xorg-server/miext/shadow')
| -rw-r--r-- | xorg-server/miext/shadow/Makefile.am | 1 | ||||
| -rw-r--r-- | xorg-server/miext/shadow/shadow.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/miext/shadow/Makefile.am b/xorg-server/miext/shadow/Makefile.am index 1db8a26b4..27cf41422 100644 --- a/xorg-server/miext/shadow/Makefile.am +++ b/xorg-server/miext/shadow/Makefile.am @@ -7,6 +7,7 @@ sdk_HEADERS = shadow.h endif libshadow_la_SOURCES = \ + c2p_core.h \ shadow.c \ shadow.h \ shafb4.c \ diff --git a/xorg-server/miext/shadow/shadow.c b/xorg-server/miext/shadow/shadow.c index 2d869e54b..1a9088c43 100644 --- a/xorg-server/miext/shadow/shadow.c +++ b/xorg-server/miext/shadow/shadow.c @@ -219,7 +219,7 @@ shadowRemove(ScreenPtr pScreen, PixmapPtr pPixmap) shadowBuf(pScreen); if (pBuf->pPixmap) { - DamageUnregister(&pBuf->pPixmap->drawable, pBuf->pDamage); + DamageUnregister(pBuf->pDamage); pBuf->update = 0; pBuf->window = 0; pBuf->randr = 0; |