diff options
author | marha <marha@users.sourceforge.net> | 2010-11-30 10:03:09 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-11-30 10:03:09 +0000 |
commit | 3e2f3f105cfe65384d2adeb2bd678850d9be47f9 (patch) | |
tree | 1c3e43a774683e6e47cbd2293679b7115fbaa3cb /libX11/src | |
parent | fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7 (diff) | |
parent | 57818d0fe4f7cf94279909f03ec11b326b284f1e (diff) | |
download | vcxsrv-3e2f3f105cfe65384d2adeb2bd678850d9be47f9.tar.gz vcxsrv-3e2f3f105cfe65384d2adeb2bd678850d9be47f9.tar.bz2 vcxsrv-3e2f3f105cfe65384d2adeb2bd678850d9be47f9.zip |
svn merge ^/branches/released .
Diffstat (limited to 'libX11/src')
-rw-r--r-- | libX11/src/IntAtom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libX11/src/IntAtom.c b/libX11/src/IntAtom.c index 61a7f6d2f..a06689950 100644 --- a/libX11/src/IntAtom.c +++ b/libX11/src/IntAtom.c @@ -190,7 +190,7 @@ XInternAtom ( typedef struct {
unsigned long start_seq;
unsigned long stop_seq;
- char **names;
+ const char **names;
Atom *atoms;
int count;
Status status;
@@ -239,7 +239,7 @@ Bool _XIntAtomHandler( Status
XInternAtoms (
Display *dpy,
- char **names,
+ const char **names,
int count,
Bool onlyIfExists,
Atom *atoms_return)
|