From 89499350173da693a0dfa60101b313a73da60fda Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 29 Jun 2016 14:28:49 +0200
Subject: Xserver: Post-REGION-macros-to-inline-funcs clean-up.

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

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

diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c
index 07fa62018..e48fab0f2 100644
--- a/nx-X11/programs/Xserver/Xext/shape.c
+++ b/nx-X11/programs/Xserver/Xext/shape.c
@@ -317,7 +317,6 @@ ProcShapeRectangles (client)
     register ClientPtr client;
 {
     WindowPtr		pWin;
-    ScreenPtr		pScreen;
     REQUEST(xShapeRectanglesReq);
     xRectangle		*prects;
     int		        nrects, ctype;
@@ -350,7 +349,6 @@ ProcShapeRectangles (client)
 	client->errorValue = stuff->ordering;
         return BadValue;
     }
-    pScreen = pWin->drawable.pScreen;
     nrects = ((stuff->length  << 2) - sizeof(xShapeRectanglesReq));
     if (nrects & 4)
 	return BadLength;
-- 
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/shape.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c
index e48fab0f2..76d1fdd77 100644
--- a/nx-X11/programs/Xserver/Xext/shape.c
+++ b/nx-X11/programs/Xserver/Xext/shape.c
@@ -147,7 +147,7 @@ typedef struct _ShapeEvent {
  ****************/
 
 void
-ShapeExtensionInit(INITARGS)
+ShapeExtensionInit(void)
 {
     ExtensionEntry *extEntry;
 
-- 
cgit v1.2.3