diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-06 15:19:47 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-26 18:42:56 +0100 |
commit | f6a11402755a2489babb8bbf1c3b8b97b8d1ac7a (patch) | |
tree | 173571d8efc077b9802e412eac8a03967f2b9896 /nx-X11/programs/Xserver/os/utils.c | |
parent | e1f2902bb1ad29f852f97dc08a3e3e29ad88c384 (diff) | |
download | nx-libs-f6a11402755a2489babb8bbf1c3b8b97b8d1ac7a.tar.gz nx-libs-f6a11402755a2489babb8bbf1c3b8b97b8d1ac7a.tar.bz2 nx-libs-f6a11402755a2489babb8bbf1c3b8b97b8d1ac7a.zip |
Xserver/os/oscolor.c: Follow X.org in dropping the rgb.txt file entirely. Content of that file is now hard-coded.
Adopting an exact copy of os/oscolor.c from X.org leads to this compiler warning:
```
oscolor.c:844:1: warning: string length ‘7614’ is greater than the length ‘4095’ ISO C99 compilers are required to support [-Woverlength-strings]
};
^
```
This will be address later in coordination with X.org.
Note: there is a tiny change in oscolor.c as we ship it. The original X.org file includes <X11/keysym.h> which seems
unneeded. We drop that one line from oscolor.c.
Fixes ArcticaProject/nx-libs#259.
Diffstat (limited to 'nx-X11/programs/Xserver/os/utils.c')
-rw-r--r-- | nx-X11/programs/Xserver/os/utils.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 204494d63..af793454f 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -565,7 +565,6 @@ void UseMsg(void) ErrorF("-c turns off key-click\n"); ErrorF("c # key-click volume (0-100)\n"); ErrorF("-cc int default color visual class\n"); - ErrorF("-co file color database file\n"); #ifdef COMMANDLINE_CHALLENGED_OPERATING_SYSTEMS ErrorF("-config file read options from file\n"); #endif @@ -771,13 +770,6 @@ ProcessCommandLine(int argc, char *argv[]) else UseMsg(); } - else if ( strcmp( argv[i], "-co") == 0) - { - if(++i < argc) - rgbPath = argv[i]; - else - UseMsg(); - } else if ( strcmp( argv[i], "-core") == 0) CoreDump = TRUE; else if ( strcmp( argv[i], "-dpi") == 0) |