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/DefErrMsg.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/DefErrMsg.c')
-rw-r--r-- | libXmu/src/DefErrMsg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libXmu/src/DefErrMsg.c b/libXmu/src/DefErrMsg.c index 091d2c4aa..3cb914a9d 100644 --- a/libXmu/src/DefErrMsg.c +++ b/libXmu/src/DefErrMsg.c @@ -43,7 +43,7 @@ XmuPrintDefaultErrorMessage(Display *dpy, XErrorEvent *event, FILE *fp) char buffer[BUFSIZ]; char mesg[BUFSIZ]; char number[32]; - char *mtype = "XlibMessage"; + _Xconst char *mtype = "XlibMessage"; register _XExtension *ext = (_XExtension *)NULL; _XExtension *bext = (_XExtension *)NULL; XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); |