summaryrefslogtreecommitdiff
path: root/xserver/miext/shadow
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2010-12-21 20:10:50 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2010-12-21 20:10:50 +0000
commit239364510e41b034ad6ecb6cb51120232e7166cc (patch)
tree37c3c57c97d3fda8179a0204d94318a738309cc0 /xserver/miext/shadow
parent9c0c4e62648084518b26f71ef3e5664454486b42 (diff)
Update to xorg-server 1.9.3. Tested by japser@, landry@ and ajacoutot@
in various configurations.
Diffstat (limited to 'xserver/miext/shadow')
-rw-r--r--xserver/miext/shadow/Makefile.in2
-rw-r--r--xserver/miext/shadow/shpacked.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/xserver/miext/shadow/Makefile.in b/xserver/miext/shadow/Makefile.in
index 671d06d23..a251979b0 100644
--- a/xserver/miext/shadow/Makefile.in
+++ b/xserver/miext/shadow/Makefile.in
@@ -213,6 +213,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@
ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@
+ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@
+ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FBDEVHW_FALSE = @FBDEVHW_FALSE@
diff --git a/xserver/miext/shadow/shpacked.c b/xserver/miext/shadow/shpacked.c
index 20d2ea19e..06606bcf3 100644
--- a/xserver/miext/shadow/shpacked.c
+++ b/xserver/miext/shadow/shpacked.c
@@ -102,8 +102,8 @@ shadowUpdatePacked (ScreenPtr pScreen,
width -= i;
scr += i;
#define PickBit(a,i) (((a) >> (i)) & 1)
- while (i--)
- *win++ = *sha++;
+ memcpy(win, sha, i * sizeof(FbBits));
+ sha += i;
}
shaLine += shaStride;
y++;