hw/nxagent/NXextensions.c: Drop functions already present in identica…

…l form in dix/extension.c.
sunweaver · Apr 5, 2016 · 9692e6a · 9692e6a
1 parent 5413ae8
commit 9692e6a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 330 deletions.
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
@@ -328,7 +328,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o     \
               hw/nxagent/NXrender.o      \
               hw/nxagent/NXglyph.o       \
               hw/nxagent/NXpicture.o     \
-              hw/nxagent/NXextension.o   \
               hw/nxagent/NXglxext.o      \
               hw/nxagent/NXmiglyph.o     \
               hw/nxagent/NXmiexpose.o    \
@@ -348,7 +347,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o     \
               hw/nxagent/NXrender.o      \
               hw/nxagent/NXglyph.o       \
               hw/nxagent/NXpicture.o     \
-              hw/nxagent/NXextension.o   \
               hw/nxagent/NXglxext.o      \
               hw/nxagent/NXxvdisp.o      \
               hw/nxagent/NXmiglyph.o     \
@@ -367,7 +365,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o     \
               hw/nxagent/NXrender.o      \
               hw/nxagent/NXglyph.o       \
               hw/nxagent/NXpicture.o     \
-              hw/nxagent/NXextension.o   \
               hw/nxagent/NXglxext.o      \
               hw/nxagent/NXxvdisp.o      \
               hw/nxagent/NXmiglyph.o     \

diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile
@@ -76,6 +76,10 @@ VENDORRELEASE = XVendorRelease
 #endif
 #endif
 
+#if defined(NXAgentServer) && NXAgentServer
+NX_DEFINES = -DNXAGENT_SERVER
+#endif
+
 SITE_DEFINES = $(SITE_FONT_PATH) $(SITE_RGB_DB) $(SITE_DISPLAY_CLASS)
 
 VENDOR_DEFINES = $(VENDOR_STRING) $(VENDOR_RELEASE) $(QUARTZ_DEFINES)
@@ -92,6 +96,7 @@ SpecialCObjectRule(main,$(ICONFIGFILES),$(VENDOR_DEFINES))
 SpecialCObjectRule(pixmap,$(ICONFIGFILES),$(_NOOP_))
 SpecialCObjectRule(privates,$(ICONFIGFILES),$(_NOOP_))
 SpecialCObjectRule(window,$(ICONFIGFILES),$(QUARTZ_DEFINES))
+SpecialCObjectRule(extension,$(ICONFIGFILES),$(NX_DEFINES))
 
 NormalLibraryTarget(xpstubs,$(XPOBJ))
 

diff --git a/nx-X11/programs/Xserver/dix/extension.c b/nx-X11/programs/Xserver/dix/extension.c
@@ -303,7 +303,9 @@ CloseDownExtensions()
     }
 }
 
-
+#if NXAGENT_SERVER
+#include "../hw/nxagent/NXextension.c"
+#else
 int
 ProcQueryExtension(ClientPtr client)
 {
@@ -408,7 +410,7 @@ ProcListExtensions(ClientPtr client)
     }
     return(client->noClientException);
 }
-
+#endif
 
 ExtensionLookupProc 
 LookupProc(char *name, GCPtr pGC)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -16,7 +16,6 @@ SRCS =  NXwindow.c \
 	NXrender.c \
 	NXglyph.c \
 	NXpicture.c \
-	NXextension.c \
 	NXshm.c \
         NXglxext.c \
         NXxvdisp.c \
@@ -78,7 +77,6 @@ OBJS =  NXwindow.o \
 	NXrender.o \
 	NXglyph.o \
 	NXpicture.o \
-	NXextension.o \
 	NXshm.o \
         NXglxext.o \
         NXxvdisp.o \