aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/parser/Vendor.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-09 05:23:48 +0000
committermarha <marha@users.sourceforge.net>2009-09-09 05:23:48 +0000
commit81f91c615982e50bb62708201569c33a3cd3d973 (patch)
tree4f32ecc48a3b7b5e76642f3792338263c53879bd /xorg-server/hw/xfree86/parser/Vendor.c
parentb571a562410f565af2bdde52d9f7f9a23ffae04f (diff)
parenta915739887477b28d924ecc8417ee107d125bd6c (diff)
downloadvcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.gz
vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.bz2
vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.zip
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/parser/Vendor.c')
-rw-r--r--xorg-server/hw/xfree86/parser/Vendor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/parser/Vendor.c b/xorg-server/hw/xfree86/parser/Vendor.c
index d1e608067..dce3f1ca1 100644
--- a/xorg-server/hw/xfree86/parser/Vendor.c
+++ b/xorg-server/hw/xfree86/parser/Vendor.c
@@ -223,7 +223,7 @@ xf86freeVendorList (XF86ConfVendorPtr p)
TestFree (p->vnd_identifier);
TestFree (p->vnd_comment);
xf86optionListFree (p->vnd_option_lst);
- xf86conffree (p);
+ free (p);
}
void
@@ -239,6 +239,6 @@ xf86freeVendorSubList (XF86ConfVendSubPtr ptr)
xf86optionListFree (ptr->vs_option_lst);
prev = ptr;
ptr = ptr->list.next;
- xf86conffree (prev);
+ free (prev);
}
}