diff options
author | marha <marha@users.sourceforge.net> | 2011-11-14 09:42:43 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-11-14 09:42:43 +0100 |
commit | 93795f7d8ca73dd428a926901cbc632015ac0cf5 (patch) | |
tree | 3fdcae64c6a51d6512aa32387846a2f282439855 /libXmu/src/StrToGrav.c | |
parent | 00ea126522f5bbf5c4600ddb93a45b260475c8c1 (diff) | |
parent | 156e37d3879b316329e3e05579414031da2647e2 (diff) | |
download | vcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.tar.gz vcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.tar.bz2 vcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/src/util/makekeys.c
Diffstat (limited to 'libXmu/src/StrToGrav.c')
-rw-r--r-- | libXmu/src/StrToGrav.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libXmu/src/StrToGrav.c b/libXmu/src/StrToGrav.c index 44cc13bb0..ca8bb5322 100644 --- a/libXmu/src/StrToGrav.c +++ b/libXmu/src/StrToGrav.c @@ -39,7 +39,7 @@ in this Software without prior written authorization from The Open Group. */ static struct _namepair { XrmQuark quark; - char *name; + _Xconst char *name; XtGravity gravity; } names[] = { { NULLQUARK, XtEForget, ForgetGravity }, |