diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-03-21 15:54:24 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-05-02 15:35:45 +0200 |
commit | fb832b01e9a497d6e59d026cdd58068101f4c4cb (patch) | |
tree | aff1cb03bfe753461971366c2700d36eb9970ac7 /nx-X11/programs/Xserver/dix | |
parent | 5e6b72dc745eafa8b8b74e2d42ca8f2cac6aff4e (diff) | |
download | nx-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/dix')
-rw-r--r-- | nx-X11/programs/Xserver/dix/atom.c | 2 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/dix/dixutils.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/dix/atom.c b/nx-X11/programs/Xserver/dix/atom.c index 583f2dafc..29e60be03 100644 --- a/nx-X11/programs/Xserver/dix/atom.c +++ b/nx-X11/programs/Xserver/dix/atom.c @@ -75,7 +75,7 @@ static NodePtr *nodeTable; void FreeAtom(NodePtr patom); Atom -MakeAtom(char *string, unsigned len, Bool makeit) +MakeAtom(const char *string, unsigned len, Bool makeit) { register NodePtr * np; unsigned i; diff --git a/nx-X11/programs/Xserver/dix/dixutils.c b/nx-X11/programs/Xserver/dix/dixutils.c index 8bcfce619..e91303851 100644 --- a/nx-X11/programs/Xserver/dix/dixutils.c +++ b/nx-X11/programs/Xserver/dix/dixutils.c @@ -171,7 +171,7 @@ ISOLatin1ToLower (unsigned char source) void -CopyISOLatin1Lowered(unsigned char *dest, unsigned char *source, int length) +CopyISOLatin1Lowered(char *dest, const char *source, int length) { register int i; |