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/os/oscolor.c | |
| 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/os/oscolor.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/oscolor.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/os/oscolor.c b/nx-X11/programs/Xserver/os/oscolor.c index e8692a92c..a8b01b4b9 100644 --- a/nx-X11/programs/Xserver/os/oscolor.c +++ b/nx-X11/programs/Xserver/os/oscolor.c @@ -98,8 +98,8 @@ int rgb_dbm = 0; #endif extern void CopyISOLatin1Lowered( - unsigned char * /*dest*/, - unsigned char * /*source*/, + char * /*dest*/, + const char * /*source*/, int /*length*/); int @@ -191,8 +191,8 @@ typedef struct _dbEntry { extern void CopyISOLatin1Lowered( - unsigned char * /*dest*/, - unsigned char * /*source*/, + char * /*dest*/, + const char * /*source*/, int /*length*/); static dbEntryPtr hashTab[HASHSIZE]; @@ -354,7 +354,7 @@ lookup(char *name, int len, Bool create) char *str = name; if (!(name = (char*)ALLOCATE_LOCAL(len +1))) return NULL; - CopyISOLatin1Lowered((unsigned char *)name, (unsigned char *)str, len); + CopyISOLatin1Lowered(name, str, len); name[len] = '\0'; for(str = name; *str; str++) { |