diff options
author | marha <marha@users.sourceforge.net> | 2010-06-14 13:15:50 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-06-14 13:15:50 +0000 |
commit | e2eb44705a8e4886d81b75c12e68aaebe9946439 (patch) | |
tree | 00639c4f594cdaf4cb08d30dfdb4d4a4e38bc16c /xorg-server/dix | |
parent | 2dc9ef67a51796a1e25bd31eb58663a8023ddd80 (diff) | |
parent | 0cf9b03f4990f61640dc35dfac250f929b57b4ed (diff) | |
download | vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.tar.gz vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.tar.bz2 vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/dix')
-rw-r--r-- | xorg-server/dix/dixfonts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c index f46902419..1cc5a9161 100644 --- a/xorg-server/dix/dixfonts.c +++ b/xorg-server/dix/dixfonts.c @@ -1838,7 +1838,7 @@ SetDefaultFontPath(char *path) if (!start) {
temp_path = Xprintf("%s%sbuilt-ins", path, *path ? "," : "");
} else {
- temp_path = xstrdup(path);
+ temp_path = strdup(path);
}
if (!temp_path)
return BadAlloc;
|