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/config/cf/X11.tmpl | |
| 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/config/cf/X11.tmpl')
| -rw-r--r-- | nx-X11/config/cf/X11.tmpl | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index fe94e1f4d..54f94355d 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -312,12 +312,6 @@ XORGRELSTRING = XorgManVersionString #ifndef DefaultFSFontPath # define DefaultFSFontPath DefaultFontPath #endif -#ifndef DefaultRGBDatabase -#define DefaultRGBDatabase $(USRDATADIR)/rgb -#endif -#ifndef UseRgbTxt -#define UseRgbTxt NO /* default is to compile with dbm */ -#endif #ifndef UseMemLeak #define UseMemLeak NO #endif |