aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-03-04 16:10:38 +0100
committerUlrich Sibiller <uli42@gmx.de>2017-03-04 16:10:38 +0100
commit22f542626cf9935fd55a899e21144111e481542c (patch)
tree741bdcc3a30b7b2e23a57c377ca057db38803129
parent65c5d8ad7a46a83338c23dee66e208a014c3d3d2 (diff)
downloadnx-libs-22f542626cf9935fd55a899e21144111e481542c.tar.gz
nx-libs-22f542626cf9935fd55a899e21144111e481542c.tar.bz2
nx-libs-22f542626cf9935fd55a899e21144111e481542c.zip
os: add timingsafe_memcmp to Imake
There might be some library linking missing on platforms that deliver timingsafe_memcmp but I cannot test that here.
-rw-r--r--nx-X11/config/cf/Imake.tmpl3
-rw-r--r--nx-X11/programs/Xserver/os/Imakefile9
2 files changed, 10 insertions, 2 deletions
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 8d2526712..d4b033888 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -468,6 +468,9 @@ XCOMM the platform-specific parameters - edit site.def to change
#ifndef HasBasename
#define HasBasename YES
#endif
+#ifndef HasTimingsafeMemcmp
+#define HasTimingsafeMemcmp NO /* assume not */
+#endif
#ifndef HasGetopt
# if !defined(Win32Architecture)
# define HasGetopt YES
diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile
index 787a9ef2c..8b260fa32 100644
--- a/nx-X11/programs/Xserver/os/Imakefile
+++ b/nx-X11/programs/Xserver/os/Imakefile
@@ -115,17 +115,22 @@ GETPEER_DEFINES = -DHAS_GETPEEREID
# endif
#endif
+#if !HasTimingsafeMemcmp
+TMEMCMP_SRCS = timingsafe_memcmp.c
+TMEMCMP_OBJS = timingsafe_memcmp.o
+#endif
+
BOOTSTRAPCFLAGS =
SRCS = WaitFor.c access.c connection.c io.c $(COLOR_SRCS) \
osinit.c utils.c log.c auth.c mitauth.c secauth.c \
$(XDMAUTHSRCS) $(RPCSRCS) xdmcp.c OtherSources \
xstrans.c $(SNPRINTF_SRCS) $(STRLCAT_SRCS) \
- $(REALLOCARRAY_SRCS) xprintf.c timingsafe_memcmp.c
+ $(REALLOCARRAY_SRCS) xprintf.c $(TMEMCMP_SRCS)
OBJS = WaitFor.o access.o connection.o io.o $(COLOR_OBJS) \
osinit.o utils.o log.o auth.o mitauth.o secauth.o \
$(XDMAUTHOBJS) $(RPCOBJS) xdmcp.o OtherObjects \
xstrans.o $(SNPRINTF_OBJS) $(STRLCAT_OBJS) \
- $(REALLOCARRAY_OBJS) xprintf.o timingsafe_memcmp.o
+ $(REALLOCARRAY_OBJS) xprintf.o $(TMEMCMP_OBJS)
#if UseMemLeak
MEM_DEFINES = -DMEMBUG