From deafb99fd8faf8b044eaee13d072440ce4db76af Mon Sep 17 00:00:00 2001
From: Maya Rashish <maya@NetBSD.org>
Date: Sun, 23 Aug 2020 21:19:33 +0300
Subject: [PATCH] Avoid the use of "register" keyword in public headers.

This causes issues when compiling code for C++17.
---
 include/X11/ImUtil.h  | 12 ++++++------
 include/X11/Xlibint.h | 18 +++++++++---------
 src/GetWAttrs.c       |  2 +-
 src/ImUtil.c          |  8 ++++----
 src/PutBEvent.c       |  4 ++--
 src/PutImage.c        |  4 ++--
 src/SetCRects.c       |  2 +-
 src/Window.c          |  6 +++---
 src/XlibInt.c         |  4 ++--
 9 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/include/X11/ImUtil.h b/include/X11/ImUtil.h
index ffdba1a9..779e1dc1 100644
--- a/include/X11/ImUtil.h
+++ b/include/X11/ImUtil.h
@@ -15,16 +15,16 @@ _XGetBitsPerPixel(
 extern int
 _XSetImage(
     XImage *srcimg,
-    register XImage *dstimg,
-    register int x,
-    register int y);
+    XImage *dstimg,
+    int x,
+    int y);
 
 extern int
 _XReverse_Bytes(
-    register unsigned char *bpt,
-    register int nb);
+    unsigned char *bpt,
+    int nb);
 extern void
 _XInitImageFuncPtrs(
-    register XImage *image);
+    XImage *image);
 
 #endif /* _X11_IMUTIL_H_ */
diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h
index 4214b235..f2864745 100644
--- a/include/X11/Xlibint.h
+++ b/include/X11/Xlibint.h
@@ -675,12 +675,12 @@ extern void _XFlushGCCache(Display *dpy, GC gc);
 #define Data32(dpy, data, len) _XData32(dpy, (_Xconst long *)data, len)
 extern int _XData32(
 	     Display *dpy,
-	     register _Xconst long *data,
+	     _Xconst long *data,
 	     unsigned len
 );
 extern void _XRead32(
 	     Display *dpy,
-	     register long *data,
+	     long *data,
 	     long len
 );
 #else
@@ -1382,10 +1382,10 @@ extern int _XF86LoadQueryLocaleFont(
 );
 
 extern void _XProcessWindowAttributes (
-    register Display *dpy,
+    Display *dpy,
     xChangeWindowAttributesReq *req,
-    register unsigned long valuemask,
-    register XSetWindowAttributes *attributes);
+    unsigned long valuemask,
+    XSetWindowAttributes *attributes);
 
 extern int _XDefaultError(
         Display *dpy,
@@ -1395,7 +1395,7 @@ extern int _XDefaultIOError(
         Display *dpy);
 
 extern void _XSetClipRectangles (
-    register Display *dpy,
+    Display *dpy,
     GC gc,
     int clip_x_origin, int clip_y_origin,
     XRectangle *rectangles,
@@ -1403,13 +1403,13 @@ extern void _XSetClipRectangles (
     int ordering);
 
 Status _XGetWindowAttributes(
-    register Display *dpy,
+    Display *dpy,
     Window w,
     XWindowAttributes *attr);
 
 int _XPutBackEvent (
-    register Display *dpy,
-    register XEvent *event);
+    Display *dpy,
+    XEvent *event);
 
 extern Bool _XIsEventCookie(
         Display *dpy,
diff --git a/src/GetWAttrs.c b/src/GetWAttrs.c
index 0f5f7bb8..0775eabc 100644
--- a/src/GetWAttrs.c
+++ b/src/GetWAttrs.c
@@ -87,7 +87,7 @@ _XWAttrsHandler(
 
 Status
 _XGetWindowAttributes(
-    register Display *dpy,
+    Display *dpy,
     Window w,
     XWindowAttributes *attr)
 {
diff --git a/src/ImUtil.c b/src/ImUtil.c
index 0d996e8e..36f08a03 100644
--- a/src/ImUtil.c
+++ b/src/ImUtil.c
@@ -269,7 +269,7 @@ static void _putbits(
  * valid, and reinit the functions if not.
  */
 void _XInitImageFuncPtrs (
-    register XImage *image)
+    XImage *image)
 {
 	image->f.create_image = XCreateImage;
 	image->f.destroy_image = _XDestroyImage;
@@ -918,9 +918,9 @@ static XImage *_XSubImage (
 
 int _XSetImage(
     XImage *srcimg,
-    register XImage *dstimg,
-    register int x,
-    register int y)
+    XImage *dstimg,
+    int x,
+    int y)
 {
 	register unsigned long pixel;
 	register int row, col;
diff --git a/src/PutBEvent.c b/src/PutBEvent.c
index 1768e032..0f9df342 100644
--- a/src/PutBEvent.c
+++ b/src/PutBEvent.c
@@ -34,8 +34,8 @@ from The Open Group.
 
 int
 _XPutBackEvent (
-    register Display *dpy,
-    register XEvent *event)
+    Display *dpy,
+    XEvent *event)
 	{
 	register _XQEvent *qelt;
 	XEvent store = *event;
diff --git a/src/PutImage.c b/src/PutImage.c
index 1954d086..857ee916 100644
--- a/src/PutImage.c
+++ b/src/PutImage.c
@@ -119,8 +119,8 @@ static unsigned char const _reverse_nibs[0x100] = {
 
 int
 _XReverse_Bytes(
-    register unsigned char *bpt,
-    register int nb)
+    unsigned char *bpt,
+    int nb)
 {
     do {
 	*bpt = _reverse_byte[*bpt];
diff --git a/src/SetCRects.c b/src/SetCRects.c
index c7ad3fcf..b18c449a 100644
--- a/src/SetCRects.c
+++ b/src/SetCRects.c
@@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group.
 
 /* can only call when display is locked. */
 void _XSetClipRectangles (
-    register Display *dpy,
+    Display *dpy,
     GC gc,
     int clip_x_origin, int clip_y_origin,
     XRectangle *rectangles,
diff --git a/src/Window.c b/src/Window.c
index 85a28f37..e643f219 100644
--- a/src/Window.c
+++ b/src/Window.c
@@ -30,10 +30,10 @@ in this Software without prior written authorization from The Open Group.
 #include "Xlibint.h"
 
 void _XProcessWindowAttributes (
-    register Display *dpy,
+    Display *dpy,
     xChangeWindowAttributesReq *req,
-    register unsigned long valuemask,
-    register XSetWindowAttributes *attributes)
+    unsigned long valuemask,
+    XSetWindowAttributes *attributes)
 {
     unsigned long values[32];
     register unsigned long *value = values;
diff --git a/src/XlibInt.c b/src/XlibInt.c
index 3f97d72e..6eb844e2 100644
--- a/src/XlibInt.c
+++ b/src/XlibInt.c
@@ -269,7 +269,7 @@ void _XSetSeqSyncFunction(Display *dpy)
 #ifdef LONG64
 void _XRead32(
     Display *dpy,
-    register long *data,
+    long *data,
     long len)
 {
     register int *buf;
@@ -1648,7 +1648,7 @@ void Data(
 int
 _XData32(
     Display *dpy,
-    register _Xconst long *data,
+    _Xconst long *data,
     unsigned len)
 {
     register int *buf;
-- 
GitLab