MAINTAINERS: add Jeremy Sequoia as hw/xquartz & rootless maintainer

Jeremy's practically being the maintainer of it for long time, but
just hadn't been formally recorded yet.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

MAINTAINERS

@@ -0,0 +1,366 @@
+List of maintainers
+===================
+
+Descriptions of section entries and preferred order
+---------------------------------------------------
+
+	M: *Mail* patches to: FullName <address@domain>
+	R: Designated *Reviewer*: FullName <address@domain>
+	   These reviewers should be CCed on patches.
+	L: *Mailing list* that is relevant to this area
+	S: *Status*, one of the following:
+	   Supported:	Someone is actually paid to look after this.
+	   Maintained:	Someone actually looks after it.
+	   Odd Fixes:	It has a maintainer but they don't have time to do
+			much other than throw the odd patch in. See below..
+	   Orphan:	No current maintainer [but maybe you could take the
+			role as you write your new code].
+	   Obsolete:	Old code. Something tagged obsolete generally means
+			it has been replaced by a better system and you
+			should be using that.
+	W: *Web-page* with status/info
+	Q: *Patchwork* web based patch tracking system site
+	B: URI for where to file *bugs*. A web-page with detailed bug
+	   filing info, a direct bug tracker link, or a mailto: URI.
+	C: URI for *chat* protocol, server and channel where developers
+	   usually hang out, for example irc://server/channel.
+	P: Subsystem Profile document for more details submitting
+	   patches to the given subsystem. This is either an in-tree file,
+	   or a URI. See Documentation/maintainer/maintainer-entry-profile.rst
+	   for details.
+	T: *SCM* tree type and location.
+	   Type is one of: git, hg, quilt, stgit, topgit
+	F: *Files* and directories wildcard patterns.
+	   A trailing slash includes all files and subdirectory files.
+	   F:	drivers/net/	all files in and below drivers/net
+	   F:	drivers/net/*	all files in drivers/net, but not below
+	   F:	*/net/*		all files in "any top level directory"/net
+	   One pattern per line.  Multiple F: lines acceptable.
+	X: *Excluded* files and directories that are NOT maintained, same
+	   rules as F:. Files exclusions are tested before file matches.
+	   Can be useful for excluding a specific subdirectory, for instance:
+	   F:	net/
+	   X:	net/ipv6/
+	   matches all files in and below net excluding net/ipv6/
+	N: Files and directories *Regex* patterns.
+	   N:	[^a-z]tegra	all files whose path contains tegra
+	                        (not including files like integrator)
+	   One pattern per line.  Multiple N: lines acceptable.
+	   scripts/get_maintainer.pl has different behavior for files that
+	   match F: pattern and matches of N: patterns.  By default,
+	   get_maintainer will not look at git log history when an F: pattern
+	   match occurs.  When an N: match occurs, git log history is used
+	   to also notify the people that have git commit signatures.
+	K: *Content regex* (perl extended) pattern match in a patch or file.
+	   For instance:
+	   K: of_get_profile
+	      matches patches or files that contain "of_get_profile"
+	   K: \b(printk|pr_(info|err))\b
+	      matches patches or files that contain one or more of the words
+	      printk, pr_info or pr_err
+	   One regex pattern per line.  Multiple K: lines acceptable.
+
+Maintainers List
+----------------
+
+.. note:: When reading this list, please look for the most precise areas
+          first. When adding to this list, please keep the entries in
+          alphabetical order.
+
+COMPOSITE EXTENSION
+M:	Keith Packard <keithp@keithp.com>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	composite/*
+
+CONFIG SUBSYSTEM
+M:	Adam Jackson <ajax@nwnk.net>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	config/*
+
+DAMAGE EXTENSION
+M:	Keith Packard <keithp@keithp.com>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	damageext/*
+F:	miext/damage/*
+
+DEVICE INDEPENDENT X
+M:	Keith Packard <keithp@keithp.com>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	dix/*
+
+DOCUMENTATION
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Unmaintaind
+F:	dix/*
+F:	man/*
+
+DOUBLE BUFFER EXTENSION
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	dbe/*
+
+DRI3 SUBSYSTEM
+M:	Adam Jackson <ajax@nwnk.net>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	dri3/*
+F:	hw/xfree86/dri*
+
+EXA SUBSYSTEM
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	exa/*
+
+FRAMEBUFFER SUBSYSTEM
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	fb/*
+
+GLAMOR SUBSYSTEM
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	glamor/*
+
+INPUT SUBSYSTEM
+M:	Daniel Stone <daniel@fooishbar.org>
+M:	Peter Hutterer <peter.hutterer@who-t.net>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	Xi/*
+
+KDRIVE - XSERVER
+M:	Keith Packard <keithp@keithp.com>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	hw/kdrive/*
+
+MISC X EXTENSIONS
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	Xext/*
+
+OS LAYER
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Maintined
+F:	os/*
+
+PRESENT EXTENSION
+M:	Keith Packard <keithp@keithp.com>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	present/*
+
+PSEUDORAMIX EXTENSION - MINIMAL XINERAMA FOR ROOTLESS
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	pseudoramiX/*
+
+QUARTZ XSERVER
+M:	Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+L:	xorg-devel@lists.x.org
+L:	xquartz-dev@lists.macosforge.org
+W:	https://www.xquartz.org/
+S:	Maintained
+F:	hw/xquartz/*
+
+RANDR EXTENSION
+M:	Keith Packard <keithp@keithp.com>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	randr/*
+
+RECORD EXTENSION
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	record/*
+
+RENDER EXTENSION
+M:	Keith Packard <keithp@keithp.com>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	render/*
+
+ROOTLESS EXTENSION
+M:	Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	miext/rootless/*
+
+SHADOW EXTENSION
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	miext/shadow/*
+
+SYNC EXTENSION
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	miext/sync/*
+
+TESTS
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Unmaintained
+F:	test/*
+
+XACE subsystem (security policy extensions framework)
+M:	Eamon Walsh <ewalsh@tycho.nsa.gov>
+L:	xorg-devel@lists.x.org
+W:	http://people.freedesktop.org/~ewalsh/xace_proposal.html
+S:	Maintained
+
+XFIXES EXTENSION
+M:	Keith Packard <keithp@keithp.com>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	xfixes
+
+XFREE86 / XORG - XSERVER
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	hw/xfree86/*
+
+XFREE86 LOADER SUBSYSTEM
+M:	Adam Jackson <ajax@nwnk.net>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	hw/xfree86/loader/*
+
+XKB - KEYBOARD HANDLING
+M:	Daniel Stone <daniel@fooishbar.org>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	xkb
+
+XNEST - NESTING XSERVER
+M:	Enrico Weigelt <info@metux.net>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	hw/xnest/*
+
+XVFB - VIRTUAL FRAMEBUFFER XSERVER
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Unmaintained
+F:	hw/vfb/*
+
+XWAYLAND - WAYLAND BASED XSERVER
+M:	Olivier Fourdan <ofourdan@redhat.com>
+L:	xorg-devel@lists.x.org
+L:	wayland-devel@lists.freedesktop.org
+W:	https://wayland.freedesktop.org/xserver.html
+S:	Maintained
+F:	hw/xwayland/*
+
+XWIN - MS-WINDOWS XSERVER
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	hw/xwin/*
+
+THE REST
+M:	?
+S:	Buried alive in reporters
+T:	git https://gitlab.freedesktop.org/xorg/xserver.git
+C:	irc://irc.oftc.net/xorg-devel
+W:	https://wiki.x.org
+F:	*
+F:	*/
+
+X.Org OS ports
+--------------
+FreeBSD
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Unmaintained
+
+Linux/i386
+M:	Egbert Eich <eich@freedesktop.org>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+
+Linux/x86_64
+M:	Egbert Eich <eich@freedesktop.org>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+
+Linux/ia64
+M:	Jesse Barnes <jbarnes@virtuousgeek.org>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+
+Linux/ppc
+M:	Benjamin Herrenschmidt <benh@kernel.crashing.org>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+
+Linux/sparc
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Unmaintained
+
+Mac OS X (Xquartz)
+M:	Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+L:	xquartz-dev@lists.macosforge.org
+W:	https://www.xquartz.org/
+L:	xorg-devel@lists.x.org
+S:	Maintained
+
+NetBSD
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Unmaintained
+
+OpenBSD
+M:	Matthieu Herrb <matthieu.herrb@laas.fr>
+L:	xorg-devel@lists.x.org
+S:	Maintained
+
+SCO (OpenServer 5)
+M:	Kean Johnston <jkj@freedesktop.org>
+L:	xorg-devel@lists.x.org
+S:	Unmaintained
+
+Solaris (x86 & sparc) & illumos
+M:	Alan Coopersmith <alan.coopersmith@oracle.com>
+M:	Niveditha Rau <niveditha.rau@oracle.com>
+L:	xorg-devel@lists.x.org
+W:	https://github.com/oracle/solaris-userland/tree/master/components/x11
+S:	Maintained
+
+USL (UnixWare 7.1.x, OpenServer 6)
+M:	Kean Johnston <jkj@freedesktop.org>
+L:	xorg-devel@lists.x.org
+S:	Unmaintained
+
+Cygwin
+M:	Jon TURNEY <jon.turney@dronecode.org.uk>
+M:	Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+L:	cygwin-xfree@cygwin.com
+W:	https://x.cygwin.com/
+S:	Maintained
+
+MinGW
+M:	Colin Harrison <colin.harrison@virgin.net>
+W:	http://www.straightrunning.com/XmingNotes/
+S:	Maintained
+
+GNU/Hurd
+M:	Samuel Thibault <samuel.thibault@ens-lyon.org>
+L:	bug-hurd@gnu.org
+S:	Maintained

dix/closestr.h

@@ -99,7 +99,7 @@ typedef struct _LFclosure {
 typedef struct _PTclosure {
     ClientPtr client;
     DrawablePtr pDraw;
-    GC *pGC;
+    GCPtr pGC;
     unsigned char *pElt;
     unsigned char *endReq;
     unsigned char *data;
@@ -115,7 +115,7 @@ typedef struct _PTclosure {
 typedef struct _ITclosure {
     ClientPtr client;
     DrawablePtr pDraw;
-    GC *pGC;
+    GCPtr pGC;
     BYTE nChars;
     unsigned char *data;
     int xorg;

dix/dispatch.c

@@ -1558,7 +1558,7 @@ int
 ProcCreateGC(ClientPtr client)
 {
     int error, rc;
-    GC *pGC;
+    GCPtr pGC;
     DrawablePtr pDraw;
     unsigned len;
 
@@ -1575,7 +1575,7 @@ ProcCreateGC(ClientPtr client)
     len = client->req_len - bytes_to_int32(sizeof(xCreateGCReq));
     if (len != Ones(stuff->mask))
         return BadLength;
-    pGC = (GC *) CreateGC(pDraw, stuff->mask, (XID *) &stuff[1], &error,
+    pGC = (GCPtr) CreateGC(pDraw, stuff->mask, (XID *) &stuff[1], &error,
                           stuff->gc, client);
     if (error != Success)
         return error;
@@ -1587,7 +1587,7 @@ ProcCreateGC(ClientPtr client)
 int
 ProcChangeGC(ClientPtr client)
 {
-    GC *pGC;
+    GCPtr pGC;
     int result;
     unsigned len;
 
@@ -1608,8 +1608,8 @@ ProcChangeGC(ClientPtr client)
 int
 ProcCopyGC(ClientPtr client)
 {
-    GC *dstGC;
+    GCPtr dstGC;
-    GC *pGC;
+    GCPtr pGC;
     int result;
 
     REQUEST(xCopyGCReq);
@@ -1633,7 +1633,7 @@ ProcCopyGC(ClientPtr client)
 int
 ProcSetDashes(ClientPtr client)
 {
-    GC *pGC;
+    GCPtr pGC;
     int result;
 
     REQUEST(xSetDashesReq);
@@ -1659,7 +1659,7 @@ int
 ProcSetClipRectangles(ClientPtr client)
 {
     int nr, result;
-    GC *pGC;
+    GCPtr pGC;
 
     REQUEST(xSetClipRectanglesReq);
 
@@ -1684,7 +1684,7 @@ ProcSetClipRectangles(ClientPtr client)
 int
 ProcFreeGC(ClientPtr client)
 {
-    GC *pGC;
+    GCPtr pGC;
     int rc;
 
     REQUEST(xResourceReq);
@@ -1774,7 +1774,7 @@ ProcCopyArea(ClientPtr client)
 {
     DrawablePtr pDst;
     DrawablePtr pSrc;
-    GC *pGC;
+    GCPtr pGC;
 
     REQUEST(xCopyAreaReq);
     RegionPtr pRgn;
@@ -1812,7 +1812,7 @@ int
 ProcCopyPlane(ClientPtr client)
 {
     DrawablePtr psrcDraw, pdstDraw;
-    GC *pGC;
+    GCPtr pGC;
 
     REQUEST(xCopyPlaneReq);
     RegionPtr pRgn;
@@ -1858,7 +1858,7 @@ int
 ProcPolyPoint(ClientPtr client)
 {
     int npoint;
-    GC *pGC;
+    GCPtr pGC;
     DrawablePtr pDraw;
 
     REQUEST(xPolyPointReq);
@@ -1881,7 +1881,7 @@ int
 ProcPolyLine(ClientPtr client)
 {
     int npoint;
-    GC *pGC;
+    GCPtr pGC;
     DrawablePtr pDraw;
 
     REQUEST(xPolyLineReq);
@@ -1904,7 +1904,7 @@ int
 ProcPolySegment(ClientPtr client)
 {
     int nsegs;
-    GC *pGC;
+    GCPtr pGC;
     DrawablePtr pDraw;
 
     REQUEST(xPolySegmentReq);
@@ -1924,7 +1924,7 @@ int
 ProcPolyRectangle(ClientPtr client)
 {
     int nrects;
-    GC *pGC;
+    GCPtr pGC;
     DrawablePtr pDraw;
 
     REQUEST(xPolyRectangleReq);
@@ -1945,7 +1945,7 @@ int
 ProcPolyArc(ClientPtr client)
 {
     int narcs;
-    GC *pGC;
+    GCPtr pGC;
     DrawablePtr pDraw;
 
     REQUEST(xPolyArcReq);
@@ -1965,7 +1965,7 @@ int
 ProcFillPoly(ClientPtr client)
 {
     int things;
-    GC *pGC;
+    GCPtr pGC;
     DrawablePtr pDraw;
 
     REQUEST(xFillPolyReq);
@@ -1995,7 +1995,7 @@ int
 ProcPolyFillRectangle(ClientPtr client)
 {
     int things;
-    GC *pGC;
+    GCPtr pGC;
     DrawablePtr pDraw;
 
     REQUEST(xPolyFillRectangleReq);
@@ -2017,7 +2017,7 @@ int
 ProcPolyFillArc(ClientPtr client)
 {
     int narcs;
-    GC *pGC;
+    GCPtr pGC;
     DrawablePtr pDraw;
 
     REQUEST(xPolyFillArcReq);
@@ -2090,7 +2090,7 @@ ReformatImage(char *base, int nbytes, int bpp, int order)
 int
 ProcPutImage(ClientPtr client)
 {
-    GC *pGC;
+    GCPtr pGC;
     DrawablePtr pDraw;
     long length;                /* length of scanline server padded */
     long lengthProto;           /* length of scanline protocol padded */
@@ -2361,7 +2361,7 @@ ProcPolyText(ClientPtr client)
 
     REQUEST(xPolyTextReq);
     DrawablePtr pDraw;
-    GC *pGC;
+    GCPtr pGC;
 
     REQUEST_AT_LEAST_SIZE(xPolyTextReq);
     VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
@@ -2385,7 +2385,7 @@ ProcImageText8(ClientPtr client)
 {
     int err;
     DrawablePtr pDraw;
-    GC *pGC;
+    GCPtr pGC;
 
     REQUEST(xImageTextReq);
 
@@ -2411,7 +2411,7 @@ ProcImageText16(ClientPtr client)
 {
     int err;
     DrawablePtr pDraw;
-    GC *pGC;
+    GCPtr pGC;
 
     REQUEST(xImageTextReq);
 

dix/dixfonts.c

@@ -1103,7 +1103,7 @@ doPolyText(ClientPtr client, PTclosurePtr c)
     int err = Success, lgerr;   /* err is in X error, not font error, space */
     enum { NEVER_SLEPT, START_SLEEP, SLEEPING } client_state = NEVER_SLEPT;
     FontPathElementPtr fpe;
-    GC *origGC = NULL;
+    GCPtr origGC = NULL;
     int itemSize = c->reqType == X_PolyText8 ? 1 : 2;
 
     if (client->clientGone) {
@@ -1213,7 +1213,7 @@ doPolyText(ClientPtr client, PTclosurePtr c)
             if (lgerr == Suspended) {
                 if (!ClientIsAsleep(client)) {
                     int len;
-                    GC *pGC;
+                    GCPtr pGC;
                     PTclosurePtr new_closure;
 
                     /*  We're putting the client to sleep.  We need to do a few things
@@ -1354,7 +1354,7 @@ doPolyText(ClientPtr client, PTclosurePtr c)
 }
 
 int
-PolyText(ClientPtr client, DrawablePtr pDraw, GC * pGC, unsigned char *pElt,
+PolyText(ClientPtr client, DrawablePtr pDraw, GCPtr pGC, unsigned char *pElt,
          unsigned char *endReq, int xorg, int yorg, int reqType, XID did)
 {
     PTclosureRec local_closure = {
@@ -1409,7 +1409,7 @@ doImageText(ClientPtr client, ITclosurePtr c)
     lgerr = LoadGlyphs(client, c->pGC->font, c->nChars, itemSize, c->data);
     if (lgerr == Suspended) {
         if (!ClientIsAsleep(client)) {
-            GC *pGC;
+            GCPtr pGC;
             unsigned char *data;
             ITclosurePtr new_closure;
             ITclosurePtr old_closure;
@@ -1500,7 +1500,7 @@ doImageText(ClientPtr client, ITclosurePtr c)
 }
 
 int
-ImageText(ClientPtr client, DrawablePtr pDraw, GC * pGC, int nChars,
+ImageText(ClientPtr client, DrawablePtr pDraw, GCPtr pGC, int nChars,
           unsigned char *data, int xorg, int yorg, int reqType, XID did)
 {
     ITclosureRec local_closure;

dix/dixutils.c

@@ -202,7 +202,7 @@ int
 dixLookupFontable(FontPtr *pFont, XID id, ClientPtr client, Mask access)
 {
     int rc;
-    GC *pGC;
+    GCPtr pGC;
 
     client->errorValue = id;    /* EITHER font or gc */
     rc = dixLookupResourceByType((void **) pFont, id, X11_RESTYPE_FONT, client,

dix/gc.c

@@ -73,7 +73,7 @@ static Bool CreateDefaultTile(GCPtr pGC);
 static unsigned char DefaultDash[2] = { 4, 4 };
 
 void
-ValidateGC(DrawablePtr pDraw, GC * pGC)
+ValidateGC(DrawablePtr pDraw, GCPtr pGC)
 {
     (*pGC->funcs->ValidateGC) (pGC, pGC->stateChanges, pDraw);
     pGC->stateChanges = 0;
@@ -121,7 +121,7 @@ ValidateGC(DrawablePtr pDraw, GC * pGC)
     _var = (_type)pUnion->ptr; pUnion++; }
 
 int
-ChangeGC(ClientPtr client, GC * pGC, BITS32 mask, ChangeGCValPtr pUnion)
+ChangeGC(ClientPtr client, GCPtr pGC, BITS32 mask, ChangeGCValPtr pUnion)
 {
     BITS32 index2;
     int error = 0;
@@ -429,7 +429,7 @@ static const struct {
 };
 
 int
-ChangeGCXIDs(ClientPtr client, GC * pGC, BITS32 mask, CARD32 *pC32)
+ChangeGCXIDs(ClientPtr client, GCPtr pGC, BITS32 mask, CARD32 *pC32)
 {
     ChangeGCVal vals[GCLastBit + 1];
     int i;
@@ -466,7 +466,7 @@ NewGCObject(ScreenPtr pScreen, int depth)
 {
     GCPtr pGC;
 
-    pGC = dixAllocateScreenObjectWithPrivates(pScreen, GC, PRIVATE_GC);
+    pGC = dixAllocateScreenObjectWithPrivates(pScreen, GCRec, PRIVATE_GC);
     if (!pGC) {
         return (GCPtr) NULL;
     }
@@ -614,7 +614,7 @@ CreateDefaultTile(GCPtr pGC)
 }
 
 int
-CopyGC(GC * pgcSrc, GC * pgcDst, BITS32 mask)
+CopyGC(GCPtr pgcSrc, GCPtr pgcDst, BITS32 mask)
 {
     BITS32 index2;
     BITS32 maskQ;

dix/privates.c

@@ -565,7 +565,7 @@ static const int offsets[] = {
     -1,                                 /* X11_RESTYPE_NONE */
     offsetof(WindowRec, devPrivates),   /* X11_RESTYPE_WINDOW */
     offsetof(PixmapRec, devPrivates),   /* X11_RESTYPE_PIXMAP */
-    offsetof(GC, devPrivates),          /* X11_RESTYPE_GC */
+    offsetof(GCRec, devPrivates),       /* X11_RESTYPE_GC */
     -1,                                 /* X11_RESTYPE_FONT */
     offsetof(CursorRec, devPrivates),   /* X11_RESTYPE_CURSOR */
     offsetof(ColormapRec, devPrivates), /* X11_RESTYPE_COLORMAP */

hw/xfree86/common/xf86VGAarbiter.c

@@ -610,7 +610,7 @@ VGAarbiterDestroyClip(GCPtr pGC)
 /* GC Ops */
 static void
 VGAarbiterFillSpans(DrawablePtr pDraw,
-                    GC * pGC,
+                    GCPtr pGC,
                     int nInit,
                     DDXPointPtr pptInit, int *pwidthInit, int fSorted)
 {
@@ -659,7 +659,7 @@ VGAarbiterPutImage(DrawablePtr pDraw,
 static RegionPtr
 VGAarbiterCopyArea(DrawablePtr pSrc,
                    DrawablePtr pDst,
-                   GC * pGC,
+                   GCPtr pGC,
                    int srcx, int srcy,
                    int width, int height, int dstx, int dsty)
 {

hw/xfree86/common/xf86VGAarbiterPriv.h

@@ -202,7 +202,7 @@ static void VGAarbiterDestroyClip(GCPtr pGC);
 static void VGAarbiterCopyClip(GCPtr pgcDst, GCPtr pgcSrc);
 
 /* GC ops */
-static void VGAarbiterFillSpans(DrawablePtr pDraw, GC * pGC, int nInit,
+static void VGAarbiterFillSpans(DrawablePtr pDraw, GCPtr pGC, int nInit,
                                 DDXPointPtr pptInit, int *pwidthInit,
                                 int fSorted);
 static void VGAarbiterSetSpans(DrawablePtr pDraw, GCPtr pGC, char *pcharsrc,
@@ -212,7 +212,7 @@ static void VGAarbiterPutImage(DrawablePtr pDraw, GCPtr pGC, int depth, int x,
                                int y, int w, int h, int leftPad, int format,
                                char *pImage);
 static RegionPtr VGAarbiterCopyArea(DrawablePtr pSrc, DrawablePtr pDst,
-                                    GC * pGC, int srcx, int srcy, int width,
+                                    GCPtr pGC, int srcx, int srcy, int width,
                                     int height, int dstx, int dsty);
 static RegionPtr VGAarbiterCopyPlane(DrawablePtr pSrc, DrawablePtr pDst,
                                      GCPtr pGC, int srcx, int srcy, int width,

hw/xnest/Args.c

@@ -27,8 +27,6 @@ is" without express or implied warranty.
 #include "servermd.h"
 #include "extinit.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Args.h"
 

hw/xnest/Color.c

@@ -25,8 +25,6 @@ is" without express or implied warranty.
 #include "colormapst.h"
 #include "resource.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "Color.h"
@@ -216,22 +214,8 @@ xnestSetInstalledColormapWindows(ScreenPtr pScreen)
     if (!xnestSameInstalledColormapWindows(icws.windows, icws.numWindows)) {
         free(xnestOldInstalledColormapWindows);
 
-#ifdef _XSERVER64
-        {
-            int i;
-            Window64 *windows = xallocarray(numWindows, sizeof(Window64));
-
-            for (i = 0; i < numWindows; ++i)
-                windows[i] = icws.windows[i];
-            XSetWMColormapWindows(xnestDisplay,
-                                  xnestDefaultWindows[pScreen->myNum], windows,
-                                  numWindows);
-            free(windows);
-        }
-#else
         XSetWMColormapWindows(xnestDisplay, xnestDefaultWindows[pScreen->myNum],
                               icws.windows, numWindows);
-#endif
 
         xnestOldInstalledColormapWindows = icws.windows;
         xnestNumOldInstalledColormapWindows = icws.numWindows;
@@ -273,19 +257,8 @@ xnestSetScreenSaverColormapWindow(ScreenPtr pScreen)
 {
     free(xnestOldInstalledColormapWindows);
 
-#ifdef _XSERVER64
-    {
-        Window64 window;
-
-        window = xnestScreenSaverWindows[pScreen->myNum];
-        XSetWMColormapWindows(xnestDisplay, xnestDefaultWindows[pScreen->myNum],
-                              &window, 1);
-        xnestScreenSaverWindows[pScreen->myNum] = window;
-    }
-#else
     XSetWMColormapWindows(xnestDisplay, xnestDefaultWindows[pScreen->myNum],
                           &xnestScreenSaverWindows[pScreen->myNum], 1);
-#endif                          /* _XSERVER64 */
 
     xnestOldInstalledColormapWindows = NULL;
     xnestNumOldInstalledColormapWindows = 0;
@@ -388,25 +361,8 @@ void
 xnestStoreColors(ColormapPtr pCmap, int nColors, xColorItem * pColors)
 {
     if (pCmap->pVisual->class & DynamicClass)
-#ifdef _XSERVER64
-    {
-        int i;
-        XColor *pColors64 = xallocarray(nColors, sizeof(XColor));
-
-        for (i = 0; i < nColors; ++i) {
-            pColors64[i].pixel = pColors[i].pixel;
-            pColors64[i].red = pColors[i].red;
-            pColors64[i].green = pColors[i].green;
-            pColors64[i].blue = pColors[i].blue;
-            pColors64[i].flags = pColors[i].flags;
-        }
-        XStoreColors(xnestDisplay, xnestColormap(pCmap), pColors64, nColors);
-        free(pColors64);
-    }
-#else
         XStoreColors(xnestDisplay, xnestColormap(pCmap),
                      (XColor *) pColors, nColors);
-#endif
 }
 
 void

hw/xnest/Cursor.c

@@ -25,8 +25,6 @@ is" without express or implied warranty.
 #include "servermd.h"
 #include "mipointrst.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "XNCursor.h"

hw/xnest/Display.c

@@ -28,8 +28,6 @@ is" without express or implied warranty.
 #include "scrnintstr.h"
 #include "servermd.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Init.h"
 #include "Args.h"
@@ -52,7 +50,7 @@ Pixel xnestWhitePixel;
 Drawable xnestDefaultDrawables[MAXDEPTH + 1];
 Pixmap xnestIconBitmap;
 Pixmap xnestScreenSaverPixmap;
-XlibGC xnestBitmapGC;
+GC xnestBitmapGC;
 unsigned long xnestEventMask;
 
 static int _X_NORETURN

hw/xnest/Display.h

@@ -15,6 +15,9 @@ is" without express or implied warranty.
 #ifndef XNESTCOMMON_H
 #define XNESTCOMMON_H
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
 #include "colormap.h"
 
 #define UNDEFINED -1
@@ -37,7 +40,7 @@ extern Pixel xnestWhitePixel;
 extern Drawable xnestDefaultDrawables[MAXDEPTH + 1];
 extern Pixmap xnestIconBitmap;
 extern Pixmap xnestScreenSaverPixmap;
-extern XlibGC xnestBitmapGC;
+extern GC xnestBitmapGC;
 extern unsigned long xnestEventMask;
 
 void xnestOpenDisplay(int argc, char *argv[]);

hw/xnest/Events.c

@@ -29,8 +29,6 @@ is" without express or implied warranty.
 #include "inputstr.h"
 #include "inpututils.h"
 
-#include "Xnest.h"
-
 #include "Args.h"
 #include "Color.h"
 #include "Display.h"

hw/xnest/Font.c

@@ -27,8 +27,6 @@ is" without express or implied warranty.
 #include "dixfontstr.h"
 #include "scrnintstr.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "XNFont.h"
 

hw/xnest/GC.c

@@ -25,8 +25,6 @@ is" without express or implied warranty.
 #include "mistruct.h"
 #include "region.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "XNGC.h"
 #include "GCOps.h"

hw/xnest/GCOps.c

@@ -26,8 +26,6 @@ is" without express or implied warranty.
 #include "region.h"
 #include "servermd.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "XNGC.h"

hw/xnest/Handlers.c

@@ -22,8 +22,6 @@ is" without express or implied warranty.
 #include "windowstr.h"
 #include "servermd.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Events.h"
 #include "Handlers.h"

hw/xnest/Init.c

@@ -33,7 +33,6 @@ is" without express or implied warranty.
 #include "servermd.h"
 #include "dixfontstr.h"
 #include "extinit_priv.h"
-#include "Xnest.h"
 
 #include "Display.h"
 #include "Screen.h"

hw/xnest/Keyboard.c

@@ -28,8 +28,6 @@ is" without express or implied warranty.
 #include "scrnintstr.h"
 #include "servermd.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "Keyboard.h"
@@ -125,26 +123,9 @@ xnestKeyboardProc(DeviceIntPtr pDev, int onoff)
     switch (onoff) {
     case DEVICE_INIT:
         XDisplayKeycodes(xnestDisplay, &min_keycode, &max_keycode);
-#ifdef _XSERVER64
-        {
-            KeySym64 *keymap64;
-            int len;
-
-            keymap64 = XGetKeyboardMapping(xnestDisplay,
-                                           min_keycode,
-                                           max_keycode - min_keycode + 1,
-                                           &mapWidth);
-            len = (max_keycode - min_keycode + 1) * mapWidth;
-            keymap = xallocarray(len, sizeof(KeySym));
-            for (i = 0; i < len; ++i)
-                keymap[i] = keymap64[i];
-            XFree(keymap64);
-        }
-#else
         keymap = XGetKeyboardMapping(xnestDisplay,
                                      min_keycode,
                                      max_keycode - min_keycode + 1, &mapWidth);
-#endif
 
         memset(modmap, 0, sizeof(modmap));
         modifier_keymap = XGetModifierMapping(xnestDisplay);

hw/xnest/Pixmap.c

@@ -25,8 +25,6 @@ is" without express or implied warranty.
 #include "privates.h"
 #include "mi.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "XNPixmap.h"

hw/xnest/Pointer.c

@@ -23,8 +23,6 @@ is" without express or implied warranty.
 #include "servermd.h"
 #include "mipointer.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "Pointer.h"

hw/xnest/Screen.c

@@ -26,8 +26,6 @@ is" without express or implied warranty.
 #include "colormapst.h"
 #include "resource.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "XNGC.h"

hw/xnest/Visual.c

@@ -15,10 +15,10 @@ is" without express or implied warranty.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
 #include "scrnintstr.h"
 #include "dix.h"
 #include "mi.h"
-#include "Xnest.h"
 
 #include "Display.h"
 #include "Visual.h"

hw/xnest/Window.c

@@ -16,6 +16,7 @@ is" without express or implied warranty.
 #include <X11/X.h>
 #include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/shape.h>
 
 #include "mi/mi_priv.h"
 
@@ -27,8 +28,6 @@ is" without express or implied warranty.
 #include "scrnintstr.h"
 #include "region.h"
 
-#include "Xnest.h"
-
 #include "Display.h"
 #include "Screen.h"
 #include "XNGC.h"

hw/xnest/XNGC.h

@@ -23,7 +23,7 @@ is" without express or implied warranty.
 /* This file uses the GC definition form Xlib.h as XlibGC. */
 
 typedef struct {
-    XlibGC gc;
+    GC gc;
 } xnestPrivGC;
 
 extern DevPrivateKeyRec xnestGCPrivateKeyRec;

hw/xnest/Xnest.h

@@ -1,94 +0,0 @@
-/*
-
-Copyright (c) 1995  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from the X Consortium.
-
-*/
-#ifndef _XORG_XNEST_H
-#define _XORG_XNEST_H
-
-/*
-** Machines with a 64 bit library interface and a 32 bit server require
-** name changes to protect the guilty.
-*/
-#ifdef _XSERVER64
-#define _XSERVER64_tmp
-#undef _XSERVER64
-typedef unsigned long XID64;
-typedef unsigned long Mask64;
-typedef unsigned long Atom64;
-typedef unsigned long VisualID64;
-typedef unsigned long Time64;
-
-#define XID     XID64
-#define Mask    Mask64
-#define Atom    Atom64
-#define VisualID VisualID64
-#define Time    Time64
-typedef XID Window64;
-typedef XID Drawable64;
-typedef XID Font64;
-typedef XID Pixmap64;
-typedef XID Cursor64;
-typedef XID Colormap64;
-typedef XID GContext64;
-typedef XID KeySym64;
-
-#define Window          Window64
-#define Drawable        Drawable64
-#define Font            Font64
-#define Pixmap          Pixmap64
-#define Cursor          Cursor64
-#define Colormap        Colormap64
-#define GContext        GContext64
-#define KeySym          KeySym64
-#endif  /*_XSERVER64*/
-
-#define GC XlibGC
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/shape.h>
-#undef GC
-
-#ifdef _XSERVER64_tmp
-#define _XSERVER64
-#undef _XSERVER64_tmp
-#undef XID
-#undef Mask
-#undef Atom
-#undef VisualID
-#undef Time
-#undef Window
-#undef Drawable
-#undef Font
-#undef Pixmap
-#undef Cursor
-#undef Colormap
-#undef GContext
-#undef KeySym
-#endif /*_XSERVER64_tmp*/
-
-#endif /* _XORG_XNEST_H */

include/gcstruct.h

@@ -279,6 +279,6 @@ typedef struct _GC {
     const GCOps *ops;
     PrivateRec *devPrivates;
     RegionPtr pCompositeClip;
-} GC;
+} GCRec;
 
 #endif                          /* GCSTRUCT_H */

mi/miglblt.c

@@ -79,7 +79,7 @@ with the sample server.
 */
 
 void
-miPolyGlyphBlt(DrawablePtr pDrawable, GC * pGC, int x, int y, unsigned int nglyph, CharInfoPtr * ppci,  /* array of character info */
+miPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr * ppci,  /* array of character info */
                void *pglyphBase       /* start of array of glyphs */
     )
 {
@@ -180,7 +180,7 @@ miPolyGlyphBlt(DrawablePtr pDrawable, GC * pGC, int x, int y, unsigned int nglyp
 }
 
 void
-miImageGlyphBlt(DrawablePtr pDrawable, GC * pGC, int x, int y, unsigned int nglyph, CharInfoPtr * ppci, /* array of character info */
+miImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr * ppci, /* array of character info */
                 void *pglyphBase      /* start of array of glyphs */
     )
 {

miext/damage/damage.c

@@ -634,7 +634,7 @@ damageAddTraps(PicturePtr pPicture,
 
 static void
 damageFillSpans(DrawablePtr pDrawable,
-                GC * pGC, int npt, DDXPointPtr ppt, int *pwidth, int fSorted)
+                GCPtr pGC, int npt, DDXPointPtr ppt, int *pwidth, int fSorted)
 {
     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
 
@@ -753,7 +753,7 @@ damagePutImage(DrawablePtr pDrawable,
 static RegionPtr
 damageCopyArea(DrawablePtr pSrc,
                DrawablePtr pDst,
-               GC * pGC,
+               GCPtr pGC,
                int srcx, int srcy, int width, int height, int dstx, int dsty)
 {
     RegionPtr ret;