From ecaf4df7f2f3bcefd22e62702a40103ad31d02e1 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 29 Jun 2016 14:58:47 +0200
Subject: Xserver/Xext/xres.c: Drop unused REQUEST macro call (for
 xXResQueryVersionReq).

 Backported from X.org:

 commit a1cb69dc28fdbfbdfaf954e0bec221f759462399
 Author: Keith Packard <keithp@keithp.com>
 Date:   Fri Nov 15 22:05:44 2013 +0900

    Xext: Clean up warnings

    GC funcs and ops are const.
    Remove unused variables.

    Signed-off-by: Keith Packard <keithp@keithp.com>
    Reviewed-by: Adam Jackson <ajax@redhat.com>

 Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
---
 nx-X11/programs/Xserver/Xext/xres.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'nx-X11/programs/Xserver/Xext/xres.c')

diff --git a/nx-X11/programs/Xserver/Xext/xres.c b/nx-X11/programs/Xserver/Xext/xres.c
index d78fa68e1..bca7b0a18 100644
--- a/nx-X11/programs/Xserver/Xext/xres.c
+++ b/nx-X11/programs/Xserver/Xext/xres.c
@@ -25,7 +25,6 @@
 static int
 ProcXResQueryVersion (ClientPtr client)
 {
-    REQUEST(xXResQueryVersionReq);
     xXResQueryVersionReply rep;
 
     REQUEST_SIZE_MATCH (xXResQueryVersionReq);
-- 
cgit v1.2.3


From b15fc63f4c0c4c741af1255d17907ba3b98b5cf9 Mon Sep 17 00:00:00 2001
From: Tomas Carnecky <tom@dbservice.com>
Date: Tue, 5 Jul 2016 08:16:09 +0200
Subject: Replace INITARGS with void

 INITARGS was a hardcoded define to void.  Since knowing the function
 signature for your extensions is kinda useful, just replace it with a
 hardcoded void, but leave the define there for API compatibility.

 Signed-off-by: Tomas Carnecky <tom@dbservice.com>
 Reviewed-by: Daniel Stone <daniel@fooishbar.org>
 Reviewed-by: Cyril Brulebois <kibi@debian.org>
 Reviewed-by: Jamey Sharp <jamey@minilop.net>
 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 Signed-off-by: Keith Packard <keithp@keithp.com>
 Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
---
 nx-X11/programs/Xserver/Xext/xres.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nx-X11/programs/Xserver/Xext/xres.c')

diff --git a/nx-X11/programs/Xserver/Xext/xres.c b/nx-X11/programs/Xserver/Xext/xres.c
index bca7b0a18..82632a031 100644
--- a/nx-X11/programs/Xserver/Xext/xres.c
+++ b/nx-X11/programs/Xserver/Xext/xres.c
@@ -300,7 +300,7 @@ SProcResDispatch (ClientPtr client)
 }
 
 void
-ResExtensionInit(INITARGS)
+ResExtensionInit(void)
 {
     (void) AddExtension(XRES_NAME, 0, 0,
                             ProcResDispatch, SProcResDispatch,
-- 
cgit v1.2.3