From 6d96798865838744966b897bca6cc2db2d6cfaff Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 18 Jan 2020 14:03:54 +0100 Subject: Literals.h: always include in compilation This change ensures Literals.h is always referenced during compilation, effectively hiding it from "unused file" detection we do occasionally to clean up the source code. --- nx-X11/programs/Xserver/hw/nxagent/Literals.h | 3 ++- nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 2 -- nx-X11/programs/Xserver/hw/nxagent/NXrender.c | 2 -- nx-X11/programs/Xserver/hw/nxagent/NXshm.c | 2 -- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Literals.h b/nx-X11/programs/Xserver/hw/nxagent/Literals.h index c0bb8c5d7..cef2904d1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Literals.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Literals.h @@ -23,6 +23,7 @@ /* */ /**************************************************************************/ +#ifdef TEST /* * Simple table used to translate a request * opcode to the name of the X request. @@ -210,4 +211,4 @@ static char *nxagentShmRequestLiteral[] = "ShmGetImage", "ShmCreatePixmap" }; - +#endif /* TEST */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index 39aec075d..626584fc8 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -162,9 +162,7 @@ void nxagentListRemoteFonts(const char *, int); #include "unistd.h" #endif -#ifdef TEST #include "Literals.h" -#endif #ifdef VIEWPORT_FRAME diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c index 76a375db2..cc5f08227 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c @@ -65,9 +65,7 @@ #undef TEST #undef DEBUG -#ifdef TEST #include "Literals.h" -#endif /* * From NXglyph.c. diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c index 83deb74c4..33f093ba2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c @@ -70,9 +70,7 @@ in this Software without prior written authorization from The Open Group. #undef TEST #undef DEBUG -#ifdef TEST #include "Literals.h" -#endif extern void fbGetImage(DrawablePtr pDrw, int x, int y, int w, int h, unsigned int format, unsigned long planeMask, char *d); -- cgit v1.2.3