aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/os/Imakefile
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/os/Imakefile
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/os/Imakefile')
-rw-r--r--nx-X11/programs/Xserver/os/Imakefile12
1 files changed, 3 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile
index d381ac272..26d9c6dff 100644
--- a/nx-X11/programs/Xserver/os/Imakefile
+++ b/nx-X11/programs/Xserver/os/Imakefile
@@ -125,10 +125,6 @@ BOOTSTRAPCFLAGS =
#if UseMemLeak
MEM_DEFINES = -DMEMBUG
#endif
-#if UseRgbTxt
- RGB_DEFINES = -DUSE_RGB_TXT
-#endif
- DBM_DEFINES = NdbmDefines
ADM_DEFINES = -DADMPATH=\"$(ADMDIR)/X\%smsgs\"
XDMCP_DEFINES = ServerXdmcpDefines
ERROR_DEFINES = ServerErrorDefines
@@ -139,14 +135,14 @@ BOOTSTRAPCFLAGS =
DEFINES = $(CONNECTION_FLAGS) $(MEM_DEFINES) \
$(XDMAUTHDEFS) $(RPCDEFS) $(SIGNAL_DEFINES) $(OS_DEFINES) \
- $(RGB_DEFINES) $(GETPEER_DEFINES) \
+ $(GETPEER_DEFINES) \
$(RANDOM_DEFINES) $(BUGMSG) $(XTRANS_FAILDEFINES) \
$(XTRANS_DEFINES) $(NX_DEFINES)
INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
-I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \
-I$(TOP)/lib/Xau $(NX_INCLUDES) \
`pkg-config --cflags-only-I pixman-1`
- DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \
+ DEPEND_DEFINES = $(XDMCP_DEFINES) $(EXT_DEFINES) \
$(TRANS_INCLUDES) $(CONNECTION_FLAGS) $(GETPEER_DEFINES) \
DependDefines
LINTLIBS = ../dix/llib-ldix.ln
@@ -182,9 +178,7 @@ SpecialCObjectRule(utils,$(ICONFIGFILES),$(XDMCP_DEFINES) $(EXT_DEFINES) $(ERROR
#if defined(SparcArchitecture) && HasGcc && !HasGcc2
oscolor.o: oscolor.c $(ICONFIGFILES)
$(RM) $@
- cc -c $(DBM_DEFINES) $(CDEBUGFLAGS) $(ALLDEFINES) $*.c
-#else
-SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
+ cc -c $(CDEBUGFLAGS) $(ALLDEFINES) $*.c
#endif
#if !HasSnprintf