aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/kdrive/fake
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-01-05 08:57:42 +0000
committermarha <marha@users.sourceforge.net>2010-01-05 08:57:42 +0000
commit4b1326f06330c00501dd84100ed3a1987e2fa631 (patch)
tree6675ebcf771a6fdfeb9a2164f08811407731482e /xorg-server/hw/kdrive/fake
parent7397e255c2e82618ab55ef2c81636c8e688b1225 (diff)
parent163827567b71b0763a4c1a7104159cd08b5c2d95 (diff)
downloadvcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.gz
vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.bz2
vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.zip
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/kdrive/fake')
-rw-r--r--xorg-server/hw/kdrive/fake/fake.c5
-rw-r--r--xorg-server/hw/kdrive/fake/fake.h1
2 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/hw/kdrive/fake/fake.c b/xorg-server/hw/kdrive/fake/fake.c
index ff597981d..ea88f0edb 100644
--- a/xorg-server/hw/kdrive/fake/fake.c
+++ b/xorg-server/hw/kdrive/fake/fake.c
@@ -457,9 +457,8 @@ void
fakeCardFini (KdCardInfo *card)
{
FakePriv *priv = card->driver;
-
- if (priv->base)
- free (priv->base);
+
+ free (priv->base);
xfree (priv);
}
diff --git a/xorg-server/hw/kdrive/fake/fake.h b/xorg-server/hw/kdrive/fake/fake.h
index 88d209674..3c4a51bbc 100644
--- a/xorg-server/hw/kdrive/fake/fake.h
+++ b/xorg-server/hw/kdrive/fake/fake.h
@@ -38,7 +38,6 @@ typedef struct _fakePriv {
typedef struct _fakeScrPriv {
Rotation randr;
Bool shadow;
- PixmapPtr pShadow;
} FakeScrPriv;
extern KdCardFuncs fakeFuncs;