aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include/dix.h
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-03-02 11:01:43 +0100
committerMihai Moldovan <ionic@ionic.de>2017-03-02 11:01:43 +0100
commit554a6fa760de47c497abcc91bb5f1f9b2756a407 (patch)
treef59b0c8ddd14dc414c952710b2010477107cde06 /nx-X11/programs/Xserver/include/dix.h
parentf42d36fb73e096113a948a04279b752689f157bc (diff)
parent9c3669c6b7ff19013b3684bb74d98ec3d121e329 (diff)
downloadnx-libs-554a6fa760de47c497abcc91bb5f1f9b2756a407.tar.gz
nx-libs-554a6fa760de47c497abcc91bb5f1f9b2756a407.tar.bz2
nx-libs-554a6fa760de47c497abcc91bb5f1f9b2756a407.zip
Merge branch 'sunweaver-pr/constify-atom-name-strings' into 3.6.x
Attributes GH PR #363: https://github.com/ArcticaProject/nx-libs/pull/363
Diffstat (limited to 'nx-X11/programs/Xserver/include/dix.h')
-rw-r--r--nx-X11/programs/Xserver/include/dix.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/include/dix.h b/nx-X11/programs/Xserver/include/dix.h
index 58f6c6eb0..4a57f724d 100644
--- a/nx-X11/programs/Xserver/include/dix.h
+++ b/nx-X11/programs/Xserver/include/dix.h
@@ -480,7 +480,7 @@ extern Atom MakeAtom(
extern Bool ValidAtom(
Atom /*atom*/);
-extern char *NameForAtom(
+extern const char *NameForAtom(
Atom /*atom*/);
extern void AtomError(void);