diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-15 18:41:52 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-01 15:19:13 +0100 |
commit | 0f9a11a94b5fb52b5f1f9c79a93c54fc6396cab8 (patch) | |
tree | 00a7164ebcce24a946e0c9501d2bfde2622069da /nx-X11/programs/Xserver/os/oscolor.c | |
parent | f22e873e6f141b98bfc57a5443c11a9d6b8645c3 (diff) | |
download | nx-libs-0f9a11a94b5fb52b5f1f9c79a93c54fc6396cab8.tar.gz nx-libs-0f9a11a94b5fb52b5f1f9c79a93c54fc6396cab8.tar.bz2 nx-libs-0f9a11a94b5fb52b5f1f9c79a93c54fc6396cab8.zip |
drop platform support: unifdef __UNIXOS2__.
Fixes ArcticaProject/nx-libs#271.
Diffstat (limited to 'nx-X11/programs/Xserver/os/oscolor.c')
-rw-r--r-- | nx-X11/programs/Xserver/os/oscolor.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/nx-X11/programs/Xserver/os/oscolor.c b/nx-X11/programs/Xserver/os/oscolor.c index 32f8a4b23..88b243d65 100644 --- a/nx-X11/programs/Xserver/os/oscolor.c +++ b/nx-X11/programs/Xserver/os/oscolor.c @@ -397,7 +397,6 @@ OsInitColors(void) if (!was_here) { -#ifndef __UNIXOS2__ #ifdef NX_TRANS_SOCKET /* * Add the trailing '.txt' if a @@ -418,12 +417,6 @@ OsInitColors(void) strcpy(path, rgbPath); strcat(path, ".txt"); #endif -#else - char *tmp = (char*)__XOS2RedirRoot(rgbPath); - path = (char*)ALLOCATE_LOCAL(strlen(tmp) +5); - strcpy(path, tmp); - strcat(path, ".txt"); -#endif if (!(rgb = fopen(path, "r"))) { #ifdef NX_TRANS_SOCKET @@ -438,11 +431,7 @@ OsInitColors(void) while(fgets(line, sizeof(line), rgb)) { lineno++; -#ifndef __UNIXOS2__ if (sscanf(line,"%d %d %d %[^\n]\n", &red, &green, &blue, name) == 4) -#else - if (sscanf(line,"%d %d %d %[^\n\r]\n", &red, &green, &blue, name) == 4) -#endif { if (red >= 0 && red <= 0xff && green >= 0 && green <= 0xff && |