aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include/dix.h
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-03-21 15:54:24 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-05-02 15:35:45 +0200
commitfb832b01e9a497d6e59d026cdd58068101f4c4cb (patch)
treeaff1cb03bfe753461971366c2700d36eb9970ac7 /nx-X11/programs/Xserver/include/dix.h
parent5e6b72dc745eafa8b8b74e2d42ca8f2cac6aff4e (diff)
downloadnx-libs-fb832b01e9a497d6e59d026cdd58068101f4c4cb.tar.gz
nx-libs-fb832b01e9a497d6e59d026cdd58068101f4c4cb.tar.bz2
nx-libs-fb832b01e9a497d6e59d026cdd58068101f4c4cb.zip
Adapt API for MakeAtom() and CopyISOLatin1Lowered to latest changes in X.org.
This requires adaptations of arguments' types for the external references to MakeAtom() and CopyISOLatin1Lowered(). These adaptations have been required in Xserver/include/dix.h, Xserver/include/dixfonts.c Xserver/dix/atom.c, Xserver/dix/dixutils.c, Xserver/os/oscolor.c.
Diffstat (limited to 'nx-X11/programs/Xserver/include/dix.h')
-rw-r--r--nx-X11/programs/Xserver/include/dix.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/include/dix.h b/nx-X11/programs/Xserver/include/dix.h
index 25260e46c..5f9d3b5d5 100644
--- a/nx-X11/programs/Xserver/include/dix.h
+++ b/nx-X11/programs/Xserver/include/dix.h
@@ -386,8 +386,8 @@ extern void ddxBeforeReset (void);
/* dixutils.c */
extern void CopyISOLatin1Lowered(
- unsigned char * /*dest*/,
- unsigned char * /*source*/,
+ char * /*dest*/,
+ const char * /*source*/,
int /*length*/);
extern int CompareISOLatin1Lowered(
@@ -511,7 +511,7 @@ extern Bool ClientIsAsleep(
/* atom.c */
extern Atom MakeAtom(
- char * /*string*/,
+ const char * /*string*/,
unsigned /*len*/,
Bool /*makeit*/);