diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-06 23:31:52 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-25 00:39:26 +0200 |
| commit | ca1e857108d412f618f35ed4a665732c809b3f60 (patch) | |
| tree | c6aa30a0ed212d9f544300490cb89988bbf97de4 /nx-X11/programs/Xserver/dix | |
| parent | 5d16046165af54a592c8c26e0b630ffc0e65babe (diff) | |
| download | nx-libs-ca1e857108d412f618f35ed4a665732c809b3f60.tar.gz nx-libs-ca1e857108d412f618f35ed4a665732c809b3f60.tar.bz2 nx-libs-ca1e857108d412f618f35ed4a665732c809b3f60.zip | |
hw/nxagent/NXextension.c: Shrink file, drop duplicate code that is indentically found in dix/extension.c.
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/Imakefile | 14 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/dix/extension.c | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile index 011641279..cc5712126 100644 --- a/nx-X11/programs/Xserver/dix/Imakefile +++ b/nx-X11/programs/Xserver/dix/Imakefile @@ -13,6 +13,16 @@ FFS_SRC = ffs.c FFS_OBJ = ffs.o #endif +#if (!(defined(NXAgentServer) && NXAgentServer)) +NXAGENT_SKIP_SRCS = \ + extension.c \ + $(NULL) +NXAGENT_SKIP_OBJS = \ + extension.o \ + $(NULL) +#endif + + SRCS = \ atom.c \ colormap.c \ @@ -21,7 +31,6 @@ SRCS = \ dispatch.c \ dixutils.c \ events.c \ - extension.c \ gc.c \ globals.c \ glyphcurs.c \ @@ -38,6 +47,7 @@ SRCS = \ dixfonts.c \ privates.c \ pixmap.c \ + $(NXAGENT_SKIP_SRCS) \ $(FFS_SRC) \ $(NULL) @@ -49,7 +59,6 @@ OBJS = \ dispatch.o \ dixutils.o \ events.o \ - extension.o \ gc.o \ globals.o \ glyphcurs.o \ @@ -66,6 +75,7 @@ OBJS = \ dixfonts.o \ privates.o \ pixmap.o \ + $(NXAGENT_SKIP_OBJS) \ $(FFS_OBJ) \ $(NULL) diff --git a/nx-X11/programs/Xserver/dix/extension.c b/nx-X11/programs/Xserver/dix/extension.c index bc106d83c..fe51f8916 100644 --- a/nx-X11/programs/Xserver/dix/extension.c +++ b/nx-X11/programs/Xserver/dix/extension.c @@ -287,7 +287,7 @@ CloseDownExtensions() } } - +#ifndef NXAGENT_SERVER int ProcQueryExtension(ClientPtr client) { @@ -392,7 +392,7 @@ ProcListExtensions(ClientPtr client) } return(client->noClientException); } - +#endif ExtensionLookupProc LookupProc(char *name, GCPtr pGC) |