summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-10-20 12:05:15 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-10-28 20:29:33 -0700
commit3b460259d0d21f9876cacd7e1f305d77b76724f7 (patch)
tree9ad57ca897b9d14436f338663bf0fcd852262eb1
parent390acfe5bb88cdab509b5eaae4041f265e969d2b (diff)
Constify atom name argument to XkbInternAtom
Matches XInternAtom, which it wraps, and quiets a bunch of const warnings in xkbcomp. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Ran Benita <ran234@gmail.com>
-rw-r--r--include/X11/extensions/XKBfile.h2
-rw-r--r--src/xkbatom.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/X11/extensions/XKBfile.h b/include/X11/extensions/XKBfile.h
index a59b16a..1455463 100644
--- a/include/X11/extensions/XKBfile.h
+++ b/include/X11/extensions/XKBfile.h
@@ -249,7 +249,7 @@ extern char * XkbAtomGetString(
extern Atom XkbInternAtom(
Display * /* dpy */,
- char * /* name */,
+ const char */* name */,
Bool /* onlyIfExists */
);
diff --git a/src/xkbatom.c b/src/xkbatom.c
index 8878892..c55ee44 100644
--- a/src/xkbatom.c
+++ b/src/xkbatom.c
@@ -103,7 +103,7 @@ static unsigned long tableLength;
static NodePtr *nodeTable;
static Atom
-_XkbMakeAtom(char *string, unsigned len, Bool makeit)
+_XkbMakeAtom(const char *string, unsigned len, Bool makeit)
{
register NodePtr *np;
unsigned i;
@@ -204,7 +204,7 @@ XkbAtomGetString(Display *dpy, Atom atm)
/***====================================================================***/
Atom
-XkbInternAtom(Display *dpy, char *name, Bool onlyIfExists)
+XkbInternAtom(Display *dpy, const char *name, Bool onlyIfExists)
{
if (name == NULL)
return None;