From 8e9e77665efb1ca232e661b99df2227ac0360e20 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sun, 5 May 2019 15:01:00 +0200
Subject: NXextension.c: use ProcQueryExtension() from dix

---
 nx-X11/programs/Xserver/dix/extension.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nx-X11/programs/Xserver/dix')

diff --git a/nx-X11/programs/Xserver/dix/extension.c b/nx-X11/programs/Xserver/dix/extension.c
index 763f57337..cd2e51fe4 100644
--- a/nx-X11/programs/Xserver/dix/extension.c
+++ b/nx-X11/programs/Xserver/dix/extension.c
@@ -332,7 +332,6 @@ CloseDownExtensions()
     }
 }
 
-#ifndef NXAGENT_SERVER
 int
 ProcQueryExtension(ClientPtr client)
 {
@@ -373,6 +372,7 @@ ProcQueryExtension(ClientPtr client)
     return(client->noClientException);
 }
 
+#ifndef NXAGENT_SERVER
 int
 ProcListExtensions(ClientPtr client)
 {
-- 
cgit v1.2.3


From 9120d1b724d7f94b92eec30a3f5e43d096268001 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sun, 5 May 2019 15:04:55 +0200
Subject: NXextension.c: use ProcListExtensions() from dix

---
 nx-X11/programs/Xserver/dix/extension.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'nx-X11/programs/Xserver/dix')

diff --git a/nx-X11/programs/Xserver/dix/extension.c b/nx-X11/programs/Xserver/dix/extension.c
index cd2e51fe4..74558dd07 100644
--- a/nx-X11/programs/Xserver/dix/extension.c
+++ b/nx-X11/programs/Xserver/dix/extension.c
@@ -372,7 +372,6 @@ ProcQueryExtension(ClientPtr client)
     return(client->noClientException);
 }
 
-#ifndef NXAGENT_SERVER
 int
 ProcListExtensions(ClientPtr client)
 {
@@ -437,7 +436,6 @@ ProcListExtensions(ClientPtr client)
     }
     return(client->noClientException);
 }
-#endif
 
 ExtensionLookupProc 
 LookupProc(char *name, GCPtr pGC)
-- 
cgit v1.2.3


From e54d2a39001bde60b6cca7795f3fa98b3e4111e6 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Mon, 28 Oct 2019 20:30:23 +0100
Subject: nxagent: drop NXextension.c

instead of including it and creating NXextension.o we can simply use
the dix version. There are no NX specials anymore.
---
 nx-X11/programs/Xserver/dix/Imakefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nx-X11/programs/Xserver/dix')

diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile
index ccdae3b82..3cdcdd9bf 100644
--- a/nx-X11/programs/Xserver/dix/Imakefile
+++ b/nx-X11/programs/Xserver/dix/Imakefile
@@ -15,7 +15,6 @@ NXAGENT_SKIP_SRCS =                  \
                     dispatch.c       \
                     dixfonts.c       \
                     events.c         \
-                    extension.c      \
                     glyphcurs.c      \
                     property.c       \
                     resource.c       \
@@ -25,7 +24,6 @@ NXAGENT_SKIP_OBJS =                  \
                     dispatch.o       \
                     dixfonts.o       \
                     events.o         \
-                    extension.o      \
                     glyphcurs.o      \
                     property.o       \
                     resource.o       \
@@ -40,6 +38,7 @@ SRCS =                          \
        cursor.c                 \
        devices.c                \
        dixutils.c               \
+       extension.c              \
        gc.c                     \
        globals.c                \
        grabs.c                  \
@@ -61,6 +60,7 @@ OBJS =                          \
        cursor.o                 \
        devices.o                \
        dixutils.o               \
+       extension.o              \
        gc.o                     \
        globals.o                \
        grabs.o                  \
-- 
cgit v1.2.3