diff options
Diffstat (limited to 'nx-X11/programs/Xserver/composite')
| -rw-r--r-- | nx-X11/programs/Xserver/composite/Imakefile | 10 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/composite/compext.c | 9 |
2 files changed, 10 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/composite/Imakefile b/nx-X11/programs/Xserver/composite/Imakefile index 911950182..cf44ded4a 100644 --- a/nx-X11/programs/Xserver/composite/Imakefile +++ b/nx-X11/programs/Xserver/composite/Imakefile @@ -1,5 +1,7 @@ #include <Server.tmpl> + NULL = + SRCS = compalloc.c compext.c compinit.c compoverlay.c compwindow.c OBJS = compalloc.o compext.o compinit.o compoverlay.o compwindow.o @@ -11,7 +13,13 @@ LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln - DEFINES = -DNXAGENT_SERVER +#if defined(NXAgentServer) && NXAgentServer + NX_DEFINES = -DNXAGENT_SERVER +#endif + + DEFINES = \ + $(NX_DEFINES) \ + $(NULL) NormalLibraryTarget(composite,$(OBJS)) NormalLibraryObjectRule() diff --git a/nx-X11/programs/Xserver/composite/compext.c b/nx-X11/programs/Xserver/composite/compext.c index d5f8fd6d4..dbde88625 100644 --- a/nx-X11/programs/Xserver/composite/compext.c +++ b/nx-X11/programs/Xserver/composite/compext.c @@ -29,16 +29,9 @@ #include "compint.h" #include "XI.h" #include "XIproto.h" +#include "protocol-versions.h" #include "extinit.h" -#ifndef SERVER_COMPOSITE_MAJOR_VERSION -#define SERVER_COMPOSITE_MAJOR_VERSION 0 -#endif - -#ifndef SERVER_COMPOSITE_MINOR_VERSION -#define SERVER_COMPOSITE_MINOR_VERSION 4 -#endif - static CARD8 CompositeReqCode; #ifndef NXAGENT_SERVER |