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/hw/xwin/winconfig.c | |
| 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/hw/xwin/winconfig.c')
| -rw-r--r-- | xorg-server/hw/xwin/winconfig.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xwin/winconfig.c b/xorg-server/hw/xwin/winconfig.c index 89a57eada..8357ff576 100644 --- a/xorg-server/hw/xwin/winconfig.c +++ b/xorg-server/hw/xwin/winconfig.c @@ -580,7 +580,7 @@ winConfigFiles () else if (filesptr != NULL && filesptr->file_fontpath)
{
from = X_CONFIG;
- defaultFontPath = xstrdup (filesptr->file_fontpath);
+ defaultFontPath = strdup (filesptr->file_fontpath);
}
winDebug ("FontPath set to \"%s\"\n", defaultFontPath);
@@ -627,7 +627,7 @@ winSetStrOption (pointer optlist, const char *name, char *deflt) if (ParseOptionValue (-1, optlist, &o))
deflt = o.value.str;
if (deflt)
- return xstrdup (deflt);
+ return strdup (deflt);
else
return NULL;
}
|