aboutsummaryrefslogtreecommitdiff
path: root/libX11/include
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-11-30 10:03:09 +0000
committermarha <marha@users.sourceforge.net>2010-11-30 10:03:09 +0000
commit3e2f3f105cfe65384d2adeb2bd678850d9be47f9 (patch)
tree1c3e43a774683e6e47cbd2293679b7115fbaa3cb /libX11/include
parentfed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7 (diff)
parent57818d0fe4f7cf94279909f03ec11b326b284f1e (diff)
downloadvcxsrv-3e2f3f105cfe65384d2adeb2bd678850d9be47f9.tar.gz
vcxsrv-3e2f3f105cfe65384d2adeb2bd678850d9be47f9.tar.bz2
vcxsrv-3e2f3f105cfe65384d2adeb2bd678850d9be47f9.zip
svn merge ^/branches/released .
Diffstat (limited to 'libX11/include')
-rw-r--r--libX11/include/X11/Xlib.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libX11/include/X11/Xlib.h b/libX11/include/X11/Xlib.h
index 4c192d883..e6cd7471b 100644
--- a/libX11/include/X11/Xlib.h
+++ b/libX11/include/X11/Xlib.h
@@ -1548,7 +1548,7 @@ extern Atom XInternAtom(
);
extern Status XInternAtoms(
Display* /* dpy */,
- char** /* names */,
+ _Xconst char** /* names */,
int /* count */,
Bool /* onlyIfExists */,
Atom* /* atoms_return */