diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-07 09:21:18 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-07 09:21:18 +0000 |
| commit | b741086f4b268041e1c171c6dc4bb9182e7666d3 (patch) | |
| tree | 02dfe9fd170cddb55b6532de49768133221ef3b6 /libxkbfile/src/xkbatom.c | |
| parent | f78ab58911de1fa9a15afffcd4fcdc11ae67c646 (diff) | |
| parent | c73dc01b6de45612b24dc2dd34fba24d81ebf46c (diff) | |
| download | vcxsrv-b741086f4b268041e1c171c6dc4bb9182e7666d3.tar.gz vcxsrv-b741086f4b268041e1c171c6dc4bb9182e7666d3.tar.bz2 vcxsrv-b741086f4b268041e1c171c6dc4bb9182e7666d3.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libxkbfile/src/xkbatom.c')
| -rw-r--r-- | libxkbfile/src/xkbatom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libxkbfile/src/xkbatom.c b/libxkbfile/src/xkbatom.c index 24bdcd764..4fca90c62 100644 --- a/libxkbfile/src/xkbatom.c +++ b/libxkbfile/src/xkbatom.c @@ -178,8 +178,8 @@ static char * _XkbNameForAtom(Atom atom) { NodePtr node; - if (atom > lastAtom) return 0; - if ((node = nodeTable[atom]) == (NodePtr)NULL) return 0; + if (atom > lastAtom) return NULL; + if ((node = nodeTable[atom]) == (NodePtr)NULL) return NULL; return strdup(node->string); } |