aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include/globals.h
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-02-06 15:19:47 +0100
committerMihai Moldovan <ionic@ionic.de>2017-03-01 15:19:17 +0100
commit7e99ae37541b48b61fe81230c5920b1a355cf67f (patch)
tree0c2591460c035730e04fc018960fb97da5a6fcc8 /nx-X11/programs/Xserver/include/globals.h
parent095ba65b0320be5ac864245c99da1a94f83d96eb (diff)
downloadnx-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/programs/Xserver/include/globals.h')
-rw-r--r--nx-X11/programs/Xserver/include/globals.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h
index 6bc31d8e7..1c4d73e64 100644
--- a/nx-X11/programs/Xserver/include/globals.h
+++ b/nx-X11/programs/Xserver/include/globals.h
@@ -12,7 +12,6 @@ extern CARD32 ScreenSaverTime;
extern CARD32 ScreenSaverInterval;
extern char *defaultFontPath;
-extern char *rgbPath;
extern int monitorResolution;
extern Bool loadableFonts;
extern int defaultColorVisualClass;