diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2016-05-13 06:19:21 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2016-05-13 06:19:21 +0200 |
| commit | aba2a534f630f5b65a53e0ea7cdba17b77263f87 (patch) | |
| tree | 8c4e2be57984a1d9e6143944d080e19f6c3049ec /nx-X11/programs/Xserver/os/oscolor.c | |
| parent | 6c6b6b962654ac3c15d27aafbe583ee74e4f2266 (diff) | |
| parent | 52dc49607e244c0e39b5d7cbdb8b41755f078aac (diff) | |
| download | nx-libs-aba2a534f630f5b65a53e0ea7cdba17b77263f87.tar.gz nx-libs-aba2a534f630f5b65a53e0ea7cdba17b77263f87.tar.bz2 nx-libs-aba2a534f630f5b65a53e0ea7cdba17b77263f87.zip | |
Merge branch 'sunweaver-pr/nxagent-no-compiler-warnings' into arctica-3.6.x
Attributes GH PR #102: https://github.com/ArcticaProject/nx-libs/pull/102
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++) { |