diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-06 15:19:47 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-01 15:19:17 +0100 |
commit | 7e99ae37541b48b61fe81230c5920b1a355cf67f (patch) | |
tree | 0c2591460c035730e04fc018960fb97da5a6fcc8 /nx-X11/config/cf/Imake.tmpl | |
parent | 095ba65b0320be5ac864245c99da1a94f83d96eb (diff) | |
download | nx-libs-7e99ae37541b48b61fe81230c5920b1a355cf67f.tar.gz nx-libs-7e99ae37541b48b61fe81230c5920b1a355cf67f.tar.bz2 nx-libs-7e99ae37541b48b61fe81230c5920b1a355cf67f.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/Imake.tmpl')
-rw-r--r-- | nx-X11/config/cf/Imake.tmpl | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index ba97b3b4c..879b55a3b 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -539,9 +539,6 @@ X_BYTE_ORDER = ByteOrder #ifndef HasMktemp #define HasMktemp NO /* if you have the mktemp command */ #endif -#ifndef HasNdbm -#define HasNdbm NO -#endif #ifndef HasSecureRPC #define HasSecureRPC NO /* if you have Secure RPC */ #endif @@ -1286,13 +1283,6 @@ TCLIBDIR = TclLibDir #ifndef ToolkitStringsABIOptions #define ToolkitStringsABIOptions /**/ #endif -#ifndef NdbmDefines -#if HasNdbm -#define NdbmDefines -DNDBM -#else -#define NdbmDefines /**/ -#endif -#endif #ifndef HasLdRunPath #define HasLdRunPath NO #endif @@ -1317,9 +1307,6 @@ TCLIBDIR = TclLibDir #ifndef MathLibrary #define MathLibrary -lm #endif -#ifndef DBMLibrary -#define DBMLibrary -ldbm -#endif #ifndef DlLibrary #define DlLibrary -ldl #endif |