diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-16 20:50:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-16 20:50:58 +0000 |
| commit | 1c94119ae26b94a60bb2c2b33494ed43c3b8a52f (patch) | |
| tree | cfe0c736c95314edac7d9f1065be9c13026ed0c1 /xorg-server/Xi/extinit.c | |
| parent | 6b29aa4559aeb6f795caee047561654bfa0a1954 (diff) | |
| download | vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.tar.gz vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.tar.bz2 vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.zip | |
svn merge -r588:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/Xi/extinit.c')
| -rw-r--r-- | xorg-server/Xi/extinit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/Xi/extinit.c b/xorg-server/Xi/extinit.c index 07057377a..9d6c81a5b 100644 --- a/xorg-server/Xi/extinit.c +++ b/xorg-server/Xi/extinit.c @@ -1156,7 +1156,7 @@ void AssignTypeAndName(DeviceIntPtr dev, Atom type, char *name)
{
dev->xinput_type = type;
- dev->name = (char *)xalloc(strlen(name) + 1);
+ dev->name = (char *)malloc(strlen(name) + 1);
strcpy(dev->name, name);
}
|